Merge "Disable Wi-Fi framework during VTS" into stage-aosp-udc-ts-dev am: 2a7fc95f am: 90bb1142

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



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