[automerger skipped] Merge "Support test override carrier privilege in CarrierPrivilegeTracker" am: 9f8c9f4716 am: 50c79f58df am: 04d7ce7af8 -s ours

am skip reason: Merged-In Ifa67e5c103a4fb1024f9cf870fd3830783774a6e with SHA-1 9c9ffdd079 is already in history

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

Change-Id: Ic98cf45355c1962e89fbb33bda307992d9d69491