Merge "Add logs to auto keepalive" am: c4712fc3ca am: 16cab32f61

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

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