Merge "Fix issues with unlocking during a swipe on the lockscreen." into...

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

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



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