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

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



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