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