Merge "KeyStore: add API to query storage type" into jb-mr2-dev