Merge "Fix black screen while animating a closing and changing TF" into tm-qpr-dev am: 8cc83cc4

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



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