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 am: 44680481

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

Change-Id: I14c48c9f340903b4066e9ca0235ebe5fcabeb15d