[automerger skipped] Merge "Update CarrierSignalAgent with new...

[automerger skipped] Merge "Update CarrierSignalAgent with new CarrierConfigManager APIs" into udc-dev am: 5b98c9f5 am: 17d788f7 -s ours

am skip reason: Merged-In I7df0840f9645a2d0462ab13d6bb083dbbcfac3a8 with SHA-1 04120adf is already in history

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



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