Merge "Make fix_unlocked_device_required_keys a build-time flag" into main