Merge "Only intercept lockIcon touches after longpress" into sc-dev am: 5e0131613a am: 5d29e068cf am: c43b871367
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15313964 Change-Id: I74efa9ba93b1f8c4a9ed998bb9ac3e17b8e67410
This commit is contained in: