Merge "Fix testKeepaliveWifiUnsupported failure" am: 3b55c68cc2

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1684429

Change-Id: Iabf2fd3919523abf771908f4c5a4ad6c9b2710e2
tree: 3985b52bf784e61caf6279c10e51cf7a147e6bc9
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING