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

Change-Id: I497c9c97663bdd159f2b29fe0818818d27342456