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

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

Change-Id: I268608dc33ddcd3031a384ea641f83117fef3155