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

# Via Android Git Automerger (2) and others
* commit 'f2f84601922f890c12b63ceaea54ee33c0aca83b':
  AndroidKeyStore: fix tests