Bug: 168635076 Bug: 183689347 Test: make SettingsRoboTests Change-Id: I1650c1c391ec3444f53360cd0f87f226b988ea04