Merge "Enable lockout timeout" into main am: f9668c392e am: c3d2521ec0

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

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