Merge "Fix black screen while animating a closing and changing TF" into udc-dev am: 3e120345 am: 4d87a4bf

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



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