[automerger skipped] Merge "DO NOT MERGE Fix of crash when error messages are triggered" am: 46fc8079dd
-s ours am: ae65af5986
-s ours am: 8cce36a71c
-s ours am: 9464f1e4ac
-s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1966608 Change-Id: I33c0554966e061ba02299d976c49518c618a0876
This commit is contained in: