Merge "Factor keystore_attestation_id into library and also use this in credstore."