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

Merge "Prevent flings after motion gestures on fully expanded keyguard" into tm-qpr-dev am: 6c78bab2 am: 7a2f650a am: 8963d739 am: 3e94f312

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



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