Merge "Keystore: Attestation fix in AOSP builds" am: cd46e02439 am: c353955500

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

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