am 00300a11: Merge "Fix addAuthToken api"

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