am 7b31afd6: am 34df42d5: Merge "Make IMMS#mSettingsObserver multiuser-aware." into mnc-dev

* commit '7b31afd6c845c039f74684f4811e5eee93ccf370':
  Make IMMS#mSettingsObserver multiuser-aware.