Merge "Only intercept lockIcon touches after longpress" into sc-dev am:...

Merge "Only intercept lockIcon touches after longpress" into sc-dev am: 5e013161 am: 5d29e068 am: c43b8713

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

Change-Id: I74efa9ba93b1f8c4a9ed998bb9ac3e17b8e67410