Merge "Merge "Add Attestation IDs State to DeviceInfo" into sc-dev am: e35b1427e6 am: e4f93339cd" into sc-v2-dev-plus-aosp