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

[automerger skipped] NotificationShade should animate away on MODE_UNLOCK_COLLAPSING am: 2be6cfe7 -s ours am: e33e283a -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: I5a2d6b9c1d21102e42bd05185e6a8f14b4020c4f