Merge "Ignore keepalive tests before S and without Tethering module" am: 8438c257fc am: 657bf7cfa1

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

Change-Id: Iefb36e5cd31500bcc473f2d38ac6d9ba4ac71204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>