Merge "[Telephony]Pre-submit test Failures at ServiceStateTrackerTest" into udc-dev am: d638c8c8

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



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