am 89bfa753: Merge "Make TelephonyProvider a singleton across users" into lmp-mr1-dev

* commit '89bfa753d65aba43f77e9ce78e2185bdd9b98a3a':
  Make TelephonyProvider a singleton across users