Merge "Skip stop if keepalive is already in stopping state" am: 719a65577d am: 077f2edd0d am: 709c386524

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

Change-Id: I0d55c6f7e876a786cbe7f301d0caecbe6456af36