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

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

Change-Id: I1febabbf23ade790a957a9000eed1a1edf2f980a