Merge "Make TelephonyProvider a singleton across users" into lmp-mr1-dev