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

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

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