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

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

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

Change-Id: If5afcf51b811fe7d0b2d60f6ba6e8071ec04727f