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

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

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