Merge "Add null check for settings default preference controller" into udc-dev am: ba44f134

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



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