Merge "Add test for unlocked-device-required key" into main