Merge "Keystore: Attestation fix in non AOSP builds"