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: a3759b40 am: 42b4824e am: 7678bcd3

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

Change-Id: I7fc85f36038b89be25cb468dad82e93412f47f6b