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

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

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