Merge "Have paused keepalives keep their hardware slot" am: 95386feff1 am: e82e214570 am: 2598bf2374

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

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