[automerger skipped] Merge "Fix black screen while animating a closing and changing TF" into tm-qpr-dev am: 8cc83cc4 am: d12365c0 -s ours am: b4c32613 -s ours am: 14a60a2c -s ours

am skip reason: Merged-In Ia037c5beaca12695fc6c00e38c454cb6dced1b33 with SHA-1 b4478c56 is already in history

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



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