Merge "keystore: fix bug in clear_uid"
tree: 2dc2af519a5b32d57c4074d7bfb45088c0e8f011
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/