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: 664ef298

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



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