Merge "Merge "Collapse shade on ACTION_CANCEL (sometimes)" into rvc-dev am:...

Merge "Merge "Collapse shade on ACTION_CANCEL (sometimes)" into rvc-dev am: aefe2772 am: 11a2b95b am: c0dee7a7" into rvc-qpr-dev-plus-aosp am: 7082a7ea

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

Change-Id: I54be4a3766cff4419c1ee137721d0759bdce97d5