Merge "Add encryption convenience methods to KeystoreClient." am: e01125c8a9 am: e1ec0c0cc6
am: 986664067c

* commit '986664067c3ad97db8265b55c4f6ecba961575d9':
  Add encryption convenience methods to KeystoreClient.
tree: 5ebbe648aac66458ee7d082ea90230612bbed7ce
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/