[automerger skipped] Merge "Add Attestation IDs State to DeviceInfo" am: d0047ec515 am: 6a5c2cd280 -s ours am: 7f09ee5330 -s ours am: 0332a7e69d -s ours

am skip reason: Merged-In I4e0a840a8f415b3b410801805a158c46be30ec6a with SHA-1 f594fce5dd is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1760969

Change-Id: I2f7b616e1e2b55f3981ed2f66734202b4642a007