Merge "Fix Keymaster VTS unique attestation failure" am: 3e4d8d0856 am: b0f932739a am: 6a1198e166 am: 51914eb0eb am: fdf1fb7753 am: 7dd6ab3d88 am: 0e8d2a04d9

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

Change-Id: Ieeaefdac9a1a248dfa9b615003d06830a4f850ec