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

Change-Id: Ie3a4336d6464db64852ae7c08d9777a20276c710