Merge "Skip carrier priv check for trusted UIDs" into rvc-dev am: f1a6972937 am: 5169953baf am: 9b6c886f1a am: 618b075f8d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12141306

Change-Id: Ifb25d0b5e4d1a8fcbe2ccf9be215929d5cc98b73