[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 skip reason: subject contains skip directive

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

Change-Id: I6b38a7fa23d1cdd1af6646b09c990c53fce397b5