Merge "Remove incorrect return value read"
tree: 50678a089e7655a166b3b8d8136db25b935bca34
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/