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

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

Change-Id: I5d1b9ce77431516042802a5044036906b0672012