Merge "Revert "Fix functionality check for WFC APM and non APM"" am: 7ae355c48e am: f1975da8b5 am: 520c3537d8

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

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