Merge "Remove system UID check from TM#hasCarrierPrivileges" am: f662348d7a

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1727530

Change-Id: Ic88e995ada0a1640aa5ddd54356fa278a0c6da02