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 am: 646757b6

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



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