Merge "fix is_secret_key_operation check" am: 7f35beb6cb am: 216b33f09c am: 4623971442
am: a3097ff932

Change-Id: If93e31e54333abbe1d8f8844f87c177ce2845473
tree: 8842a2bb3928b4766c9cbaa10ddec71e5a6381a6
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE