Merge "Fix settings crashed" into udc-dev am: 2c427629 am: af7eb730

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



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