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

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



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