[automerger skipped] Merge "DO NOT MERGE Fix of crash when error messages are...

[automerger skipped] Merge "DO NOT MERGE Fix of crash when error messages are triggered" am: 46fc8079 -s ours am: ae65af59 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ifb8bb0a0777af47ebdaec20884a3022e23921166