Merge "Merge "Network Operator" into "Mobile network" main activity." am: cf0a59d7b3
am: bbcd633bb6  -s ours

Change-Id: Ic990cfa987ac8e29300fe1db210e699915f70f4f