[automerger skipped] Merge "[Wi-Fi] Fix Wi-Fi broken tests" into rvc-dev am: 534bb50e am: d83b13f1 -s ours
am skip reason: Change-Id Ie9b9384610857e2999fe4642a93c2d31ce3315f3 with SHA-1 31f04d15 is in history
Change-Id: If84c07cf361a394984a15d4594e0cfa0a16bb978