Merge "SystemUI Carrier Network Change unit tests" into mnc-dev