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 am: 7f552a65

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



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