[automerger skipped] Merge "Fix crash due to display name is not set to View."...

[automerger skipped] Merge "Fix crash due to display name is not set to View." into main am: f31808e6 am: 4afe48b6 -s ours

am skip reason: Merged-In I2a70c4e31c182f99cc4fb3da93ce7911da005429 with SHA-1 04006ccb is already in history

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



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