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

[automerger skipped] Merge "Update CarrierSignalAgent with new CarrierConfigManager APIs" into main am: 5c9dfb2e am: ada1c43f -s ours am: f0a50ed0 -s ours

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

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



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