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

# Via Android Git Automerger (2) and others
* commit '864162026dace9de4d75836f2acacce277c93ada':
  AndroidKeyStore: add key wrapping test