[automerger skipped] Merge "Clear up CarrierPrivilegesListener APIs" am: d25623ae am: d1ca6ed0 am: 86a6fc7f -s ours am: d3c1e7b7 -s ours

am skip reason: Merged-In I89df21764d3b9945219d810d0dd9bfe3cf5fbea4 with SHA-1 5a4bcc0a is already in history

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

Change-Id: I88b05d8584d56969f7dce5cb2f82672d6a9d4652
Signed-off-by: Automerger Merge Worker