Merge "Replace OperatorInfo with operatorNumeric for network selection" am: de569035c3
am: 60eedfd6d6

Change-Id: I75f667b7b065164cf97466454209e781250f304a