Merge "Refactor TelephonyPermissions in PhoneInterfaceManager" am: 9e90776dd9 am: a65f4f44ab

Change-Id: I77b21272c5bb89317a84f49a627ea5c74374ee0f