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: 190e926a am: 01c0d19d

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

Change-Id: I04ff9cb037f72908c902acbca3f5882cedeeb64f