Merge "Disable Wi-Fi framework during VTS" into stage-aosp-udc-ts-dev