Bug: 189998237 Test: make SettingsRoboTests Change-Id: Id36c72ff8eee02c1e64f29a0dbefa0eb9804845a
d42d9a41f6