Resolve new intent that allows setting the parent challenge

Have ChooseLockGeneric resolve the new intent that allows setting the
parent challenge. If the new intent is received or seperate work
challenge is not supported, default to setting the challenge of the
parent user, otherwise use the calling user.

Change-Id: Ibd0ce8ce81b1d5c9073d4eb0096fdc74de12ee95