Merge "Keystore: Attestation fix in non AOSP builds" am: 538cb6588f

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

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