Merge "Add carrier config variable to hide preferred network type" into mnc-dr-dev