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

[automerger skipped] Merge "Update CarrierServiceStateTracker with new CarrierConfigManager APIs" into main am: dda16fec am: 8e823edd -s ours am: 8e3af532 -s ours

am skip reason: Merged-In If81ff78fcc07a3ac53181ab70c2e9e40274dd112 with SHA-1 5d2397d1 is already in history

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



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