Merge "keystore: fix inverted hardware keystore check"