Bug: 187923403 Test: make SettingsRoboTests Change-Id: I01455cef919cb8692df9d275c8dff0c68d75861f
d42d9a41f6