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