Merge "NotificationShade should animate away on MODE_UNLOCK_COLLAPSING" into sc-qpr1-dev am: a22f94bd81

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

Change-Id: Id38a11f15fe1a320cc403a8bcd864ab651bab8db