Merge "Consider swipes on the unlock icon as intent for device entry" into...

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

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

Change-Id: I746f18aad8311f9b2e7599733c25386f553d7927