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

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