[automerger skipped] Merge "Introduce CarrierPrivilegesCallback to replace...

[automerger skipped] Merge "Introduce CarrierPrivilegesCallback to replace CarrierPrivilegesListener" am: a77a04e3 am: aceba5cc am: e095f5aa -s ours am: 165a16e0 -s ours am: 06c08c21 -s ours

am skip reason: Merged-In I195a99ec6508c7fe3398908bfca632d8446ab29c with SHA-1 b66e3e3a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2028807

Change-Id: If68eb5c33d94d141c3c6148cca1fd9764fb9847f