[automerger skipped] KeyMaster: sync all attestation tags am: 2cd5f55168 -s ours

am skip reason: Merged-In I76015dcbb6d9e81166022d092038e9f42b485810 with SHA-1 17ca501d00 is already in history

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

Change-Id: If7a967d5cb51c5b3fa73cfbc4c63260cafc137bf