am 0831dea5: (-s ours) am dfe0a1a5: am d7d51a60: Merge "Revert "Remove incorrect return value read""

* commit '0831dea51ec950df5ecc9a76480abbe646a43110':
  Revert "Remove incorrect return value read"
tree: f136568de40380f2fa0931b1478c683ca5141425
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/