am 629b4376: Merge "Remove incorrect return value read"

* commit '629b43761271df0ca864fdba14bd50db62f72f56':
  Remove incorrect return value read
tree: 50678a089e7655a166b3b8d8136db25b935bca34
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/