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

Change-Id: If9079b606b579ec82b4803adf6abfdf205599eeb