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

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

Change-Id: I44f945f1804938819506dab56063d2706b27fcfd
tree: 8cde8ea9308f9b3467fa48be6df00732ef7da69a
  1. core/
  2. services/
  3. tests/