Merge "Prevent errors when updating operator pref summary" am: 5a19cea4ef am: c855a8a21a

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

Change-Id: Ibdb29f86401439a66c9aa3a456454e6caadddffa