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

Change-Id: Id22f54a8b432c352ce92fb9d6c1d514baad9ba46