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

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

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