Merge "Flush the auth token table on resetUid"
tree: b60ca0c912d5affe3f1fe9322c848ac870f2af77
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/