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

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

Change-Id: I9c7dc3cd59394d0d7bab8efeec08fa066f468927