Bug: 187485845 Test: atest SettingsComponentTests Change-Id: I6268809eca172b0b4aa9f1a252e0d519ad758083