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

* commit '00b9f8d7dd53e12104188b97736726f7863af945':
  Make TelephonyProvider a singleton across users