Merge "Always have an AutomaticOnOffKeepalive to manage a KI" am: 05600c129e am: bea24f7ca2

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

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