Android o preview 2
Merge "fix is_secret_key_operation check" am: 7f35beb6cb am: 216b33f09c
am: 4623971442

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