Merge "Remove system UID check from TM#hasCarrierPrivileges"