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: 98ac3bf2 am: 748c4b34

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

Change-Id: I8237ab47bd41841f149e223fa6925f88111829ae