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

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

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