Merge "Prevent flings after motion gestures on fully expanded keyguard take 2"...

Merge "Prevent flings after motion gestures on fully expanded keyguard take 2" into tm-qpr-dev am: 1d20402d am: 86dbfdd3 am: 6bc00907

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



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