Merge "Correct AttestKey test that checks Qualcomm's SPU waiver." am: 53faa27ace am: b0cbb2fa98

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

Change-Id: I4870016ac0d364e5f225b175d34a7043bb06437a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>