Merge "Use no_auth_required in keystore2_test_unlocked_device_required()" into main am: b58bed510c am: 5eccf3a534

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3212537

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