Merge "Keystore: Attestation fix in AOSP builds" am: ecb4b6d158 am: c17512848d

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

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