[automerger skipped] Merge "Fix crash due to over limited length." into main...

[automerger skipped] Merge "Fix crash due to over limited length." into main am: 646fa2d5 am: 17d0097a -s ours

am skip reason: Merged-In I5c72c3c9ca9cb2e4058959abc5a0b4fdd60907bf with SHA-1 a66f9dc3 is already in history

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



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