Merge "Fix onClientFinished for generate and revoke challenge" into sc-dev am: c5f6938a am: 86687a21 am: 577683bc

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

Change-Id: I385c0e7d531f66a3fe80dd6648ee39e808a746ff