Merge "[TelephonyService] Replace CONNECTIVITY_INTERNAL permission" am: f278a9c91d
am: 2d4eaad86c

Change-Id: Ie14cc34c3c809377280fd7d0e4e171667523c3bc