Merge "[DK2-2]Add flag to control dynamic keepalive mode" am: c795473a80

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

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