KeyMaster: sync all attestation tags am: 2cd5f55168

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

Change-Id: I765173b9b49c9e57cd6b27da3d6b7625cce188d6