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

Change-Id: Ie973256151747069e7c771399c799365881bdef7