Merge changes from topic 'b/36021111' into oc-dev

* changes:
  add a global control for badging
  extend TestableSettingsProvider to multiuser