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

# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '5a720bb9b031d44e593d2054bda586ccc3752aa4':
  AndroidKeyStore: add key wrapping test