Merge "Enable lockout timeout" into main am: f9668c392e

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

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