Merge "keystore: Pass verification token to credstore along with requested auth token." am: 6a917e5245

Change-Id: Ieb4fc49601b843f2d745b7f5a49c23d32889cf6d