tree b4bdda7680904fec1319db08e0f6f26a25021e99
parent 9f90086a5d4e817db0e75925ff9e6c762d0f7394
parent 9575e87746aa1e943b3ad5e6ffbcc88a9ef6e12f
author Jay Patel <pateljay@google.com> 1616684797 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616684797 +0000

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

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

Change-Id: I25e03c823b1b1d870547b4f226b3d63262b198b4