Merge "KeyMaster: sync all attestation tags" am: 37ddd7c3f7

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1719597

Change-Id: Ie99749b5c2813b6f42fd79f36ef1a75b59f8887c