Merge "Limit maximum number of concurrent keystore operations."
am: 108a5d34b5

* commit '108a5d34b5ce181dff52906a66862ec084841ec4':
  Limit maximum number of concurrent keystore operations.
tree: 09226d46b8f1e19aaf507786048cbc0f5bf26c35
  1. MODULE_LICENSE_APACHE2
  2. NOTICE
  3. keystore-engine/
  4. keystore/
  5. softkeymaster/