Merge "carrier-wifi: move Base64Encoding flag out of CarrierNetworkConfig Map"