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

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



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