Merge "Swipe-up from SHADE_LOCKED goes to LS (instead of the bouncer)" into...

Merge "Swipe-up from SHADE_LOCKED goes to LS (instead of the bouncer)" into tm-qpr-dev am: bc54ade5

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



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