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

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



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