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

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

Change-Id: Ia7fd728fbba0af9c8665d1a6b638af12f357eb00