Merge "Merge "Don't animate reorder/add when we're about to collapse." into rvc-dev am: f083c156 am: 3cb62293" into rvc-d1-dev-plus-aosp am: 54ba6eb4 am: c0b74dbe

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

Change-Id: I492c5a909c53843a4b66be29bf9cf0998aa89030