Merge "The Network name is not same as statusbar at SIM Edit page" into...

Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev am: 11af4846 am: 17fb53a1 am: e5902390

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

Change-Id: I34849b225700f7ccf74f16ac5f52cf4572ccc285