[automerger skipped] Merge "KeyMint: Fix device-unique attestation chain...

[automerger skipped] Merge "KeyMint: Fix device-unique attestation chain specification" into sc-dev am: f58618f8 -s ours am: 3966b16e -s ours

am skip reason: Merged-In I6e6bca33ebb4af67cac8e41a39e9c305d0f1345f with SHA-1 03d7a1a4 is already in history

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

Change-Id: I96ea0be24eebc5ada2977d4c2f1ed8c95d02bfa5