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

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

Change-Id: I75004dbf0512fafea3396a2884f803faa7fd0828