Merge "Use no_auth_required in keystore2_test_unlocked_device_required()" into main