Resolved copyright fix conflict

PYTHON-MANIFEST.in

setup.py

src/core/iomgr/tcp_server.h

src/core/iomgr/tcp_server_posix.c

src/core/iomgr/tcp_server_windows.c

src/core/security/server_secure_chttp2.c

src/core/surface/server_chttp2.c

src/python/grpcio/commands.py

src/python/grpcio/support.py

test/core/client_config/set_initial_connect_string_test.c

test/core/iomgr/tcp_server_posix_test.c

test/core/util/reconnect_server.c

test/core/util/test_tcp_server.c

test/core/util/test_tcp_server.h

tools/run_tests/build_artifacts.py

tools/run_tests/post_tests_ruby.sh