[WifiScannerScanTest] Fixes for flaky tests

CHERRY PICKED CHANGES FROM git_master

Fixes for flaky tests

Bug: 151274525
Bug: 152002696
Test: Verified the changes

Change-Id: Ibac9bbb2677f5793d3697d067d1e568429da6f7f
2 files changed
tree: dc02d56cb01547a43fcc985405bcdfc66ddde713
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. OWNERS
  6. PREUPLOAD.cfg