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: I4bb1345e2a8aa3ad5d3e8e44ab99631afd670813
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>