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

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



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