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

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

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