am 9d645b6b: am 69be6ebb: am f436a16b: am 50122db5: Correct double-convert from uid to userid

* commit '9d645b6b4ed6d5a0d257ae210fa2fb5c0c2b3127':
tree: 694cfb89258d1da48c68092ae1c65d0052646fe4
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/