[automerger skipped] Merge "Refactor TelephonyPermissions in PhoneInterfaceManager" am: 9e90776dd9 am: a65f4f44ab am: 7406573259 -s ours
am skip reason: Change-Id I1a6897dcd5b47f0928c11f9ae0cd2b1a6f4ac596 with SHA-1 2c0ae43690 is in history

Change-Id: I1bdfbfd99a2b2b8293ddd5b64a340eb888893dfd