am c4a768c8: am 5a720bb9: Merge "AndroidKeyStore: add key wrapping test"

# Via Android Git Automerger (1) and others
* commit 'c4a768c87e03a5e6d8b4435aaca6893546006321':
  AndroidKeyStore: add key wrapping test