Merge "Log when a TCP connection keeps up an auto keepalive" am: 5f3907317a am: a68eea1cbc

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

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