Merge "Use the binder to identify keepalive in IConnectivityManager" am: b5a87674f0

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

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