[automerger skipped] Merge "[TelephonyService] Replace CONNECTIVITY_INTERNAL permission" am: f278a9c91d am: e56a0ebf26 -s ours
am skip reason: Change-Id If05da53bdd6d5a8249e0207776a2c3acf2c62e1a with SHA-1 5a77360488 is in history

Change-Id: Ica4225f9b79c31f830909c5b22c1842a6c0c8523