Merge "Stop TCP keepalive from CS for fd initiated stop events" am: 646715e787 am: 9243af84e8 am: dfc1d78c63

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

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