Fixes: 124129485 Test: manual test Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.core Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.SettingsPreferenceFragmentTest Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.bluetooth Change-Id: I920d0de403b9c7109de0e2e53be7ed99bc8e7390