am f436a16b: am 50122db5: Correct double-convert from uid to userid

* commit 'f436a16b645b30716cab2227bb4029d64acffaf3':
tree: 10d2fae2245e3aef8136513f8b6f4e12cd8664d6
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/