[automerger skipped] Merge "[Mainline] decouple TelephonyProvider from hidden ServiceState dependencies." am: 0fa856474d am: bf099aecbc am: 49be5fd64f -s ours
am skip reason: Change-Id Ia114fe8b8c1addc1d593f62409ca4a36b09b1956 with SHA-1 64fb3ddf52 is in history

Change-Id: Ia974eb6deae73f9c9f1b56c535bd650a49f891cc