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

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

Change-Id: Id5f87409f9d75c0df4f49a90e7441db348b3bef1