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

* commit '34df42d59753e7721b346d1048c686d204a44da3':
  Make IMMS#mSettingsObserver multiuser-aware.