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