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

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