[automerger skipped] Merge "Cleanup ITelephony in TelephonyPermissions" am:...
[automerger skipped] Merge "Cleanup ITelephony in TelephonyPermissions" am: 4d4c0b75 am: afe64e9b am: 108e6c94 -s ours
am skip reason: Change-Id I6262411b2ca499d54970c5d813f957637c1d80fc with SHA-1 18d38a48 is in history
Change-Id: Ia5dba9d2e63d5d8fb0a433ac07c9ab6bbad5020a