Merge "Fix black frame when unfold animation starts" into tm-qpr-dev am: 9e41a090 am: d52e2d03

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



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