[automerger skipped] Merge "Ignore keepalive tests before S and without Tethering module" into udc-dev am: 23c86e6873 -s ours

am skip reason: Merged-In I11ef44987b5a9cbcdf5b892807f65c4f9d04812f with SHA-1 058431df27 is already in history

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

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