Merge "Clear up CarrierPrivilegesListener APIs" am: d25623ae62 am: d1ca6ed04a

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

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