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

[automerger skipped] KeyMint: sync all attestation tags am: fd5b1a6d am: 5fe86fe0 -s ours am: 7e716566 -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: I99fd614d454ae89bd8d0b492728f6fbd81e8c588