Merge "Add check for NPE in AuthenticationClient" into udc-qpr-dev am: 35759b8872

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

Change-Id: I79a4c985bbeabf8d4c6c0341421c6213ea1f627b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>