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

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