Merge "Include carrier services in user builds' connectivity bug reports."