Merge "Notify the keepalive is stopped after the slot has been released" am: 6d7c1854a8 am: b5e1feccbe am: 09ab7ad386

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

Change-Id: I846ad59dba08f17a01700378a2cdbb931629b283