Merge "Protect the Settings application from potential null pointer...

Merge "Protect the Settings application from potential null pointer exceptions." into main am: 6a4fb45e am: 840f5a57

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



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