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