Merge "fix is_secret_key_operation check"
am: 7f35beb6cb

Change-Id: Iaac7f832e1a729be5fea1f5bb8f4a2bc0248d8ae
tree: bf4edc9d5807a25d3980f0f20d6857cd4ffab15f
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE