am 1f8dcc58: Merge "keystore: add API to query storage type"

* commit '1f8dcc58c72d5a1bbebd66e21e65adfee76abc0c':
  keystore: add API to query storage type
tree: 92431a66dcb87e3f6ca5582a85957069e05e27f6
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/