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

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

Change-Id: I8a85df1aad30fa8e6b86c5ef466a55cf810926dc