am a11517f6: am 00300a11: Merge "Fix addAuthToken api"

* commit 'a11517f68a3318ee8d4f7ab631f81f73d9401bee':
  Fix addAuthToken api
tree: a5faaa115d80a6c5daf8f24eaeec7a3935713025
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/