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

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

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