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

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



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