Merge "Refactor TelephonyPermissions in PhoneInterfaceManager"
am: 9e90776dd9

Change-Id: Ic6fc57c949d062ebe9fe8d154a95495e8929ce56