Merge "Fix Keymaster VTS unique attestation failure" am: 3e4d8d08 am: b0f93273 am: 6a1198e1 am: 51914eb0

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12306609

Change-Id: I5d4090860b8ad842aed52bb4698eee2ba30b4f52