am 56995079: Merge "keystore: fix inverted hardware keystore check"

* commit '56995079413e918d3676a97d70a1700379ba5321':
  keystore: fix inverted hardware keystore check