Merge "Add Attestation IDs State to DeviceInfo"