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

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



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