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

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

Change-Id: I0e2ee2609c8fcf82ad31d9c97423b9006862cb97
(cherry picked from commit 4e3c9a1d659c86878dbb10d3d1e420718365ab5a)

Bug: 160518399

Exempt-From-Owner-Approval: already approved as aosp/1372156.
Change-Id: I0e2ee2609c8fcf82ad31d9c97423b9006862cb97
1 file changed