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

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

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