Merge "Keystore: Attestation fix for AOSP and GSI builds" am: d37d9aadbf am: 8e1e309bf8 am: 5513e8be19

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2449489

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