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

Change-Id: If47daffe8b85044272d0fd5af29d13d54b544502