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

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

Change-Id: I4dfb9b86299aee70ab67c79d70e677541fb811c2