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

[automerger skipped] Merge "Update SignalStrengthController with new CarrierConfigManager APIs" into main am: bce2d934 am: 6759f5db -s ours am: 9783b1ef -s ours am: 6e44780f -s ours am: 11e36ec9 -s ours

am skip reason: Merged-In Iab2ba44e502bb1134f2db9f3cd95c4a228e69c97 with SHA-1 de3bb2f4 is already in history

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



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