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

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

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