Merge "Don't re-wrap DeviceIdAttestationExceptions"