Merge "keystore: Add a test suitable for Brillo PTS." am: 296727f895
am: 6c4a59b0f8

* commit '6c4a59b0f8c09db267d71313413ceaa7713924bb':
  keystore: Add a test suitable for Brillo PTS.
tree: 455b4ab5e921274e5c4e12068710ffa9c014cf0e
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE