Merge "Fix NPE in *GenerateChallengeClient" into sc-dev am: 4eaca4eb94

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15130759

Change-Id: Ibc37f1554330bec3dba42fb04bf194dae76b3571