Merge "Add carrier config option to determine if "wifi-only" is supported." into nyc-dev