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

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

Change-Id: I38e1f2bebfaba00cf046cedbe51dc38bd4b83adf