[automerger skipped] Merge "Improve CarrierPrivilegesTracker with new...

[automerger skipped] Merge "Improve CarrierPrivilegesTracker with new CarrierConfigManager APIs" into main am: 7c0e97dd am: c5dfab09 -s ours am: 8ac134d0 -s ours

am skip reason: Merged-In I1d3a49a0d669fed4c6db08364c9e1c9f7f5f1eb8 with SHA-1 d58fa9e0 is already in history

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



Change-Id: I9067997ca14f8b9589dd777a45098ca0307c6974
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>