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

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