[automerger skipped] KeyMint: sync all attestation tags am: fd5b1a6d -s ours...

[automerger skipped] KeyMint: sync all attestation tags am: fd5b1a6d -s ours am: c42fdf9e -s ours

am skip reason: Merged-In I620f54ba4a265ea69d174f6f44765a8508bfe803 with SHA-1 fd5b1a6d is already in history

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

Change-Id: If533bfd38c56cd800bf57e3645c2035f7bdf763c