Merge "Fix wrong timeout and mock method in radio VTS" into stage-aosp-udc-ts-dev am: d8f18469

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24068038



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