Merge "Refactor TelephonyPermissions in PhoneInterfaceManager"