Merge changes from topic "b196625757-operator-name-view" into sc-v2-dev am: ebf67700c6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15586189

Change-Id: I5d58272227217c807dd2cabe95c7b0ff55e54869