Merge "Skip carrier priv check for trusted UIDs" am: 6d9589d849

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

Change-Id: Ie72c4fca5e005b9a2b328b928a7b35082d5697b3