Merge "Skip stop if keepalive is already in stopping state" am: cb79f645d4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424190

Change-Id: I44f945f1804938819506dab56063d2706b27fcfd