[automerger skipped] Merge "Update UiccProfile with new CarrierConfigManager...

[automerger skipped] Merge "Update UiccProfile with new CarrierConfigManager APIs" into main am: 302a37d8 am: 32d9e29b -s ours am: bf186f41 -s ours

am skip reason: Merged-In I91f97dfb5363133d2928d1f6709bb8a754c4c733 with SHA-1 66fa0a9e is already in history

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



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