Merge "Make IdentityCredentialStore.getInstance() return null if credstore is not installed." am: a970f218ea am: e5506eb032 am: ad21c990e4

Change-Id: I2ef0bb817a190df4eb48b77020211954750aed66