Merge "Make min longpress lock icon time configurable" into tm-d1-dev am:...

Merge "Make min longpress lock icon time configurable" into tm-d1-dev am: 82886590 am: 6eaadeaa am: ec616984

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



Change-Id: I5a7d23b31a300899696a69505f35ddc23870bff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>