Merge "Prevent the bouncer from showing over dreams when swiping down the...

Merge "Prevent the bouncer from showing over dreams when swiping down the shade." into tm-dev am: 07c54de3

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



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