Merge "Support test override carrier privilege in CarrierPrivilegeTracker" am: 9f8c9f4716 am: 50c79f58df

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

Change-Id: I02465ce7b352c73a6741fd6f2e4d167ecfc38d22