Bug: 188384887 Test: make SettingsRoboTests Change-Id: Ida96deb6efe94a98cf6837b9f82758467a4d1300
d42d9a41f6