am 96cf1b1e: Merge "Include operation handle in OperationResult"

* commit '96cf1b1ee907696cc4342c1b4992c657d0b6aa33':
  Include operation handle in OperationResult
tree: 684055f40cfa9d869b0ff07b6ee3255cb42ca730
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/