Merge "Quick fix for notification scrim showing when swiping up the bouncer"...

Merge "Quick fix for notification scrim showing when swiping up the bouncer" into tm-dev am: adc90ad5

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



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