Merge "[Telephony Mainline] Refactored PermissionManager"