[automerger skipped] Merge "Support CarrierService change callback in...

[automerger skipped] Merge "Support CarrierService change callback in CarrierPrivilegesTracker" am: 89dabb58 am: a0a83fc3 am: e04a6769 -s ours

am skip reason: Merged-In Id7cc95200468b1913cbcf2f0053bc1963f2c66b0 with SHA-1 9ea5fabc is already in history

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

Change-Id: I1d2ade3db2118276cfcee5629ae3f38e095ffaab