am dc7b3e3b: am 79a80652: Merge "KeyStore: stop using state()"

# Via Android Git Automerger (1) and others
* commit 'dc7b3e3b6e1aa3f347c7d843ee453688c4d90e29':
  KeyStore: stop using state()
tree: 2bd3bbb1b2cb77ac4176b8c29ef7f16c2ce49dd7
  1. core/
  2. services/