Merge "Merge "Fix 3-finger swipe unlock not working" into udc-qpr-dev am:...

Merge "Merge "Fix 3-finger swipe unlock not working" into udc-qpr-dev am: 5403afaf" into udc-qpr-dev-plus-aosp am: 02d3edca

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



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