am dfe0a1a5: am d7d51a60: Merge "Revert "Remove incorrect return value read""

* commit 'dfe0a1a5e0b37c3a327b90cbf971a3782ab16fd3':
  Revert "Remove incorrect return value read"
tree: 0a2e2c2913edacf133cba857e9e948e294bea224
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/