Merge "Refactor uids to user ids where appropriate"
tree: 4dc1202e1b8324d6531d8cf7e45a4f4553ac9279
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/