Skip automatic on/off keepalives before U. am: c2a8d8f642 am: 6d682efc9f

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

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