Merge "Clear up CarrierPrivilegesListener APIs" am: d25623ae62

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

Change-Id: I8b4527c292650ed2d315db29011508738c82d871