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

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



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