am 7d164f66: am 557ec556: Merge "KeyStore: add API to query storage type"

* commit '7d164f660da5ac18739a4781f3f6d4acb6e671b5':
  KeyStore: add API to query storage type