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: I43b28958d01a7fcf1a5289105f54210f441cac1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>