Merge "Add extra null checks" into udc-dev am: 598ff21b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23214089



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