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

Change-Id: Ie22caa7c82eeeb364a6b43b38dd87431d1312114