am 516fab24: am 133c5f5e: Merge "AndroidKeyStore: fix tests"

# Via Android Git Automerger (1) and others
* commit '516fab2404f550aca03b3774bd5b279d4e69dd9f':
  AndroidKeyStore: fix tests