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

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



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