am f271fa33: am cdc70256: am f3c117ca: Merge "Add new IKeystoreService methods to KeyStore"

* commit 'f271fa33f148b0c410e8ee06aceb1f2b57cd62c7':
  Add new IKeystoreService methods to KeyStore