Clean cherry-pick 'Aggregate network operators by PLMNs instead of Operator names.'

Bug: 111044709
Test: Manual test
Change-Id: I433f3d1d74feef5188bf4ad26e4027df77639ea5
Merged-In: I433f3d1d74feef5188bf4ad26e4027df77639ea5
2 files changed