Merge "Remove pending actions when standby" am: 9575e87746 am: ce15561657

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

Change-Id: I39cac312214821b7f9763b78feb6970ed393bea7