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

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

Change-Id: Ib0dd1e0498437f11837ccf18b6141d58f7e43850