Merge "Fix crash when error messages are triggered due to configuration...

Merge "Fix crash when error messages are triggered due to configuration changes." into sc-v2-dev am: 041d8cdb

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

Change-Id: Iea9d977556a7963a43f6d5e6b6cdeb071223e012