Merge "Fix crash when operator name contains %" into tm-dev am: 39eb991a

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



Change-Id: I9f1a431164072830f6072a120adbaf125b325e0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>