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

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



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