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

Merge "Merge "Make min longpress lock icon time configurable" into tm-d1-dev am: 82886590 am: 6ffc5c8a" into tm-qpr-dev-plus-aosp am: 859ea2d5

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



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