am 368a1f93: Merge "Store the key characteristics for operations"

* commit '368a1f93381584fdd9ae0d59748cce5e4160acfb':
  Store the key characteristics for operations
tree: 3d0e2d9363705459fe32e7595a55feac0aa09053
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/