Merge "Fixed UID mismatch in telephony registry"