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 am: 4fa7ebc0

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

Change-Id: I14ca4e11c3486c1909342a9cff118956d7f48635