Merge "Skip carrier priv check for trusted UIDs" am: 6d9589d849 am: 90cfc9b20a am: 63e4de8183 am: fb9fb070f6

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

Change-Id: I26dc1a8e01361f0f5175decf396dc92be6f02626