KeyMaster: sync all attestation tags am: 2cd5f55168

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

Change-Id: I70576d5134e5cb30b71c231f6c26d424fdcbc619