[automerger skipped] Merge "Disable Wi-Fi framework during VTS" into...

[automerger skipped] Merge "Disable Wi-Fi framework during VTS" into stage-aosp-udc-ts-dev am: 2a7fc95f am: 90bb1142 am: 95a39410 am: 7ea65f79 -s ours

am skip reason: Merged-In I5ea7f00cfebf79021185f66766454d053c973b31 with SHA-1 2236b96b is already in history

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



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