Bug: 198553245 Test: make SettingsRoboTests Change-Id: I91e715a6bfb64419b457812423996365a9464a93
d42d9a41f6