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

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



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