[automerger skipped] NotificationShade should animate away on...

[automerger skipped] NotificationShade should animate away on MODE_UNLOCK_COLLAPSING am: 2be6cfe7 am: a76369ba -s ours am: c856a61f -s ours am: ac24f427 -s ours

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

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

Change-Id: I11dabd8f5bf66df4154b797c71b61d1a08270fe5