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

* commit '39e51426a3b21d8b8ede5e1b3aa6201958d1ed32':
  Make TelephonyProvider a singleton across users