[automerger skipped] Merge "Add unit test coverage for unlock attempts in...

[automerger skipped] Merge "Add unit test coverage for unlock attempts in TrustTests" into main am: 8d426198 -s ours am: ac8d919c -s ours

am skip reason: Merged-In I1c8eaacc9c20284ef2783bcd65c14f68b0b444e8 with SHA-1 45ca5feb is already in history

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



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