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

[automerger skipped] Merge "Update ServiceStateTracker with new CarrierConfigManager APIs" into udc-dev am: 360d5f0d am: d6f15157 -s ours

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

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



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