Merge changes from topic "async_keystore"

* changes:
  Add return code KEY_ALREADY exists
  Remove legacy functions form IKeystoreService.aidl