Merge "Fixing isDeviceIdAttestationRequired to require both cases instead of just one" into main