[automerger skipped] Adjust Wifi tests for ag/5642325 am: 251c48fa85 am: ec766dbdcd
am: 1a44ca272e -s ours
am skip reason: change_id I1c15cf02c99752b8a38bfacbe322d034e0374724 with SHA1 70d45cd1bd is in history

Change-Id: Ic4f8700e07d47e1e8bc1146ae40b738f6fa60ecb
tree: c1dd4c616247e77f003493f903e31203d719c57c
  1. service/
  2. PREUPLOAD.cfg