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

Merge "Merge "Don't animate reorder/add when we're about to collapse." into rvc-dev am: f083c156 am: ac92ed7b am: 3a2916c9" into rvc-qpr-dev-plus-aosp am: 4274d097

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

Change-Id: Ie9e8f4e0cfeaeee0a8fe1412b28d3653244b05bf