[automerger skipped] Merge "Fix wrong timeout and mock method in radio VTS"...

[automerger skipped] Merge "Fix wrong timeout and mock method in radio VTS" into stage-aosp-udc-ts-dev am: d8f18469 am: a0dc5d03 am: e25159e0 am: 13b2b445 am: 11553005 -s ours

am skip reason: Merged-In Ied70fcfd2742ae5d253aec984e2161afa6f65162 with SHA-1 3729b0bd is already in history

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



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