am 05e449a0: Merge "Correct double-convert from uid to userid"

* commit '05e449a0e419967ef623804de8d1ae5b3be0e9ce':
  Correct double-convert from uid to userid
tree: bf74876166fd7d65d21bfb53fda8a7cf372b010d
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/