Merge "Keystore: Attestation fix for AOSP and GSI builds"