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

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

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