Merge "Clean up flag data_only_service_allow_emergency_call_only" into main