79f5a0416f
Bug: 5551068 Signed-off-by: Mike Lockwood <lockwood@google.com> Conflicts: packages/SettingsProvider/res/values/defaults.xml Change-Id: I6a6519316a87bd1af39ea9dc51e0d312011135ef