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

Merge "Merge "Merge "Collapse shade on ACTION_CANCEL (sometimes)" into rvc-dev am: aefe2772 am: c5b199e7" into rvc-d1-dev-plus-aosp am: 438b4406" into rvc-qpr-dev-plus-aosp am: 6d3c4921

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

Change-Id: I150a96fe6f4120d64a694e5dba2d20b396a3b376