[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 -s ours am: b93408fd -s ours am: 6f37932a -s ours

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

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



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