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

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

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