Merge "test to enforce no mccmnc.xml if there is a matching carrier id"