[automerger skipped] NotificationShade should animate away on MODE_UNLOCK_COLLAPSING am: 2be6cfe728 -s ours

am skip reason: Merged-In I2accd8bd8975b2d49c1dc91870b7cc8467c5139d with SHA-1 c7df567362 is already in history

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

Change-Id: I342e7c94f377f5250e55b43be178ff0c135e2915