Merge "Don't animate reorder/add when we're about to collapse." into rvc-dev am: f083c156 am: ac92ed7b

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

Change-Id: I03b99a48cf8e1972c77f65d7475bd5df820c09b6