Merge "Fix permission check in reset_uid and clear_uid"
tree: 4a04337701627baab82b432477889b9c1323d485
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/