[automerger skipped] Merge "Only trigger (un)lock icon on longpress" into...

[automerger skipped] Merge "Only trigger (un)lock icon on longpress" into sc-v2-dev am: 11bedc72 am: baa246b9 -s ours

am skip reason: Merged-In I0b2561db55cc35a06a9981cdeb2e70922101c96c with SHA-1 e991a77d is already in history

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

Change-Id: I1449a54f919fb05f3ae7e1ee90ee31c57f7ac3aa