Merge "[Mainline] decouple TelephonyProvider from hidden ServiceState dependencies."