[automerger skipped] Merge "Disable Wi-Fi framework during VTS" into stage-aosp-udc-ts-dev am: 2a7fc95f69 am: 90bb1142d6 am: 95a394109f am: 7ea65f793b -s ours am: 538bc27f89 -s ours

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

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

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