[automerger skipped] Merge "Add Attestation IDs State to DeviceInfo" am: d0047ec515 am: 6a5c2cd280 -s ours am: 7f09ee5330 -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: I31e081b4ea87d8522920b0c5146284d4f8231c30