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

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

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