Merge "Consider swipes on the unlock icon as intent for device entry" into sc-dev am: 876e9771

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

Change-Id: I143d295d612dd462f435ec7972118fa38744b832