Merge "Enable lockout timeout" into main am: f9668c39 am: 00e81ec1

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



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