Fixing isDeviceIdAttestationRequired to require both cases instead of just one

Bug: 356536705

Change-Id: I15326e68fc2ea1ce9a2dfbe7498790900ebb43e4
(cherry picked from commit f74d27480798c2601f8d5e00fb00b0c69823b137)
1 file changed