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

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

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