Keystore 2.0: Integrate legacy wrapper.

Test: Keystore CTS tests.
Change-Id: I570328921319b412453dc4c06b91878d300e4e48
2 files changed