am 4b79bbea: am 558184f5: Merge "Make the new AndroidKeyStore API conformant."

* commit '4b79bbeaa3c6a8820fe83aa75179b6cae550320f':
  Make the new AndroidKeyStore API conformant.