Merge "Use CHALLENGE_NONE when VerifyCredential invoked with challenge=0" into rvc-dev am: 27f4c791a2 am: 1731d51753

Change-Id: I780d20ad08d0db327a564ced48fdd57c121a2dcc