Merge "Fix null object reference" into udc-qpr-dev am: 59e9f7fe95 am: cd5522b633

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

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