Merge "Fix NPE in *GenerateChallengeClient" into sc-dev am: 4eaca4eb94 am: 59b7523212 am: ace6f49f53
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15130759 Change-Id: If7cbd00a168689355bf745bfbdd6c7df150057c0
This commit is contained in: