Merge "Make IdentityCredentialStore.getInstance() return null if credstore is not installed." am: a970f218 am: e5506eb0 Change-Id: Ie22caa7c82eeeb364a6b43b38dd87431d1312114