[automerger skipped] Adjust Wifi tests for ag/5642325 am: 0690b0fd82 am: f0e7b10315
am: aa1e4e6a00 -s ours
am skip reason: change_id I1c15cf02c99752b8a38bfacbe322d034e0374724 with SHA1 2c49b432c2 is in history

Change-Id: Ic4f8700e07d47e1e8bc1146ae40b738f6fa60ecb