Merge "Transitions - Fix scrim flash as bouncer goes away" into tm-qpr-dev am:...

Merge "Transitions - Fix scrim flash as bouncer goes away" into tm-qpr-dev am: fbcfaf0d am: d5b2c7bc am: e1bbaa68

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



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