Merge "keystore: add API to query storage type"