[automerger skipped] Merge "Introduce CarrierPrivilegesCallback to replace CarrierPrivilegesListener" am: a77a04e330 am: aceba5ccbb am: e095f5aaab -s ours
am skip reason: Merged-In I195a99ec6508c7fe3398908bfca632d8446ab29c with SHA-1 b66e3e3aa8 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2028807
Change-Id: I7dfbe6097e2b73b2b6448824079f47c5bde61c7e
This commit is contained in: