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

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

Change-Id: I179bd58ca6c931f37e68cae149ffd3c7da63fd3c