[automerger skipped] Merge "Temporarily restore wifi tests back to acts/tests" am: 082c22c7d7 -s ours

am skip reason: skipped by user xianyuanjia

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/test/connectivity/+/12152036

Change-Id: I28b79dbe2a6fe5f80c33d1d7645f9cc0c1e1e32c
tree: 7b051fd10a02a3c6c6e0d17ee1dfbbd9edcc99a3
  1. acts/
  2. acts_tests/
  3. tools/
  4. wts-acts/
  5. Android.mk
  6. OWNERS
  7. PREUPLOAD.cfg