Merge "Ensure scrim visibility updated by mPrimaryBouncerToGoneTransition"...

Merge "Ensure scrim visibility updated by mPrimaryBouncerToGoneTransition" into tm-qpr-dev am: bb53e238

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



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