Merge "Fix UnfoldAnimationControllerTest" into tm-qpr-dev am: ef78f4d0fa am: 2e46f7e4a7

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

Change-Id: I99d2f14656e0cdf84664e8b7f607c3e5a98dfe43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>