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

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

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