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

Change-Id: Ic66248f50b403f292222d1a3e0a5ba007a5b29ac