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

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



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