Merge "Merge "Network Operator" into "Mobile network" main activity."
am: cf0a59d7b3

Change-Id: I7227f63d5d3f15ce5e6c715ce394e779a614b4c5