Merge "Fix Keymaster VTS unique attestation failure" am: 3e4d8d0856 am: b0f932739a am: 6a1198e166

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

Change-Id: Id223b4ec4161f11c92b5dcb36ec417b3af50be89