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 am: 710382ed

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

Change-Id: I1f587fa977fc3e72f89e216138225c8ed84ba904