Merge "[WifiCountrySoftApAcsTest] Fix the test cannot be run on P20." into sc-dev am: ad95a686bf am: 5e603f2450

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

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