Merge "Collapse shade on ACTION_CANCEL (sometimes)" into rvc-dev am: aefe277271 am: 11a2b95bb1

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

Change-Id: I00b6120e37c208870af7dbbbd69097cee16e0d74