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

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

Change-Id: I6b12ca5cc08a2047e38742b1d5f28dc935c1ac40