Merge "Disable unfold animation when animations disabled" into sc-v2-dev am:...

Merge "Disable unfold animation when animations disabled" into sc-v2-dev am: b6815ae3 am: d07dc67f

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

Change-Id: I8cf3166e123aefa2a7741b9586288caaca9c1308