[automerger skipped] Merge "Clear up CarrierPrivilegesListener APIs" am: d25623ae62 am: d1ca6ed04a am: 86a6fc7f04 -s ours am: d3c1e7b7f7 -s ours
am skip reason: Merged-In I89df21764d3b9945219d810d0dd9bfe3cf5fbea4 with SHA-1 5a4bcc0a9c is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2040804
Change-Id: I0bbf2b9a7317f87cf42ea30dc5a8ab93e4c115a1
Signed-off-by: Automerger Merge Worker
This commit is contained in: