Merge "Fix hanging telephony tests" into udc-dev am: 9c97487e am: b2a6259a

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



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