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

# Via Android Git Automerger (1) and others
* commit 'dc7b3e3b6e1aa3f347c7d843ee453688c4d90e29':
  KeyStore: stop using state()