Bug: 204695404 Test: manual, robotest build pass, unit Change-Id: Iad2e28ada8ddb766ffa7eff2c8dc581250cbd6f8
Test: manual Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.applications make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core atest UniquePreferenceTest atest SettingsGatewayTest Change-Id: Ib5b1281be6cb3cab8528d10b6d6ff3146f33b8df