Merge "Fix NPE causing CTS test failure" into udc-dev am: 8e4a7e8b

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



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