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

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

Change-Id: I31a6290db41be9f003646067e76c7ed901ade7ae