[automerger skipped] keystore: Pass verification token to credstore along with requested auth token. am: f635cf0e31 -s ours

am skip reason: Change-Id Id6cb6812a31d968069b7d72bd2b39b512d38d241 with SHA-1 59102f388f is in history

Change-Id: I7f6ad31f47584db99969896edeb6d0a09b351dc4