Merge "Fix issues with unlocking during a swipe on the lockscreen." into tm-qpr-dev am: 286074d5

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



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