Merge "Introduce CarrierPrivilegesCallback to replace CarrierPrivilegesListener" am: cabb6b9362

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

Change-Id: I4035975b182b7ab0e93426126cbab487f4f286b3