Merge "Do not finish keyguard if method is swipe." into udc-qpr-dev am: d2a48276

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



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