am 0786207b: am dc7b3e3b: am 9657ba0e: Merge "KeyStore: stop using state()"

# Via Android Git Automerger (2) and others
* commit '0786207be59d34a8ba8a7a1e93602002fac97587':
  KeyStore: stop using state()