Fixes: 157485149 Test: make SettingsUnitTests; adb shell am instrument etc Change-Id: If8d9b446ed056996cda91fcc5e92c7077ff3ea5d