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: 11cbe13f

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



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