[automerger skipped] Merge "Support test override carrier privilege in...

[automerger skipped] Merge "Support test override carrier privilege in CarrierPrivilegeTracker" am: a0ac05da am: 0d2993e1 am: f258329d -s ours

am skip reason: Merged-In I8db3710cb6591314da29db09b322b6ba01a42247 with SHA-1 82b60d35 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2037354

Change-Id: I5d21c5da004136e34e0bd22622a7641250ef6af3