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

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

Change-Id: If886e831fba8fc7d63b3fd968d83041151284172