Merge "Clean up the Carrier Wifi network config in framework"