Merge "fix is_secret_key_operation check"
tree: bf4edc9d5807a25d3980f0f20d6857cd4ffab15f
  1. MODULE_LICENSE_APACHE2
  2. NOTICE
  3. keystore-engine/
  4. keystore/
  5. softkeymaster/