Merge "Fix the format of wifi_carrier_content string"
am: 985b432fc0

Change-Id: Ic77ff6da5081cae7a3b7fba31bc4902645188763