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

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

Change-Id: Icc6cdd58df63fecfc6c1576c80bd5c2c0fe89bcb