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: If1f3d37cf2ed165dac67430353e80d4a24897309
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>