Merge "Only trigger (un)lock icon on longpress" into sc-v2-dev am: 11bedc7218

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

Change-Id: Idf75fe4f3b29561cc514d03395b11a6922684b4b