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

Change-Id: I83621b38f4be99be59db253521a604ff2fe76d56