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

Merge "Fix NPE causing CTS test failure" into udc-dev am: 8e4a7e8b am: ebcc22f2 am: 2a2c086d am: 77b4fce9

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



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