Merge "Keystore: Attestation fix in AOSP builds"