Merge "[Mainline] decouple TelephonyProvider from hidden ServiceState dependencies."
am: 0fa856474d

Change-Id: I643618c20f2011d71f27be307e1f163d9bfe3ca1