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

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

Change-Id: If6a4892eb9a26fa4e407d67f5e067c8624271c7f