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

* commit '69be6ebb0fb8c15c3c9c3ae6c46db37fadf811bf':
tree: 4299c987e6cff9880ea5e2bd572a7c7c29286f23
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/