Merge "CCL monitors CarrierService change with CarrierPrivilegesCallback" am: 993e4e1a7a

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2106900

Change-Id: I60a6d72db902ecb47148d611c3f0706d3bd175a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>