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

[automerger skipped] Merge "Update ServiceStateTracker with new CarrierConfigManager APIs" into main am: ca02bd47 am: 12d5874e -s ours am: 7a748459 -s ours am: 090dc2d8 -s ours am: 5a11827e -s ours

am skip reason: Merged-In I852ccc7e6e0cd8c6c96087ca4667be8956ea54b7 with SHA-1 343b2e99 is already in history

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



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