Merge "Merge "[automerger skipped] Merge "[DO NOT MERGE] WifiManagerTest: wait 15 seonds for a Wifi scan." into pie-cts-dev am: 0d32a7b901 -s ours" into android10-tests-dev am: 4ec3d2d503 -s ours" into android11-tests-dev