Merge "Fix wrong timeout and mock method in radio VTS" into...

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

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



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