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

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

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