Bug: 204964119 Test: make SettingsRoboTests Change-Id: Ifbbf979abe9e96e7af66ec20173e996793d2703e
d42d9a41f6