Bug: 187770266 Test: make SettingsRoboTests Change-Id: I56897c8f91295ba2139b7fda8c59a863130ecd86
d42d9a41f6