[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "remove-CPT-registerCarrierPrivilegesListener" into main am: f9cfd7b8 am: 721efd20 -s ours am: 679e71eb -s ours am: f193f76e -s ours

am skip reason: Merged-In Ida123e2b493cb70b005b2ac47843d7c6d6f14656 with SHA-1 e8089e96 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2530423



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