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

Change-Id: I57c4c971f739c5f096e145e5858ab87f7872001e