Merge "KeyMint: sync all attestation tags" am: ba8e44599c am: 16d7e387a1 am: a5af95bff3 am: 3010af51d1

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

Change-Id: I9136b346923fa0640a607e2cd50b9e2bd6434a92