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

# Via Android Git Automerger (3) and others
* commit '46c26bd0f0452dc077ab0d51c28ccef55ff17aa6':
  AndroidKeyStore: fix tests