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

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

Change-Id: I9c7dc3cd59394d0d7bab8efeec08fa066f468927