am c598fab3: am d914f657: am 7a4dd551: Merge "Flush the auth token table on resetUid"

* commit 'c598fab3ae8e363f84e2d6f41dd6511e27df240f':
  Flush the auth token table on resetUid
tree: 13b066e766bbf75937743fabee625d7c16d1a2c1
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/