cherry pick name mapping for AddFiles (#38205) #42901

Job	Run time
Java Unit Tests (self-hosted, ubuntu-20.04, main)	14m 46s
Java Unit Tests (windows-latest)	13m 45s
Java Wordcount Direct Runner (macos-latest)	18m 6s
Java Unit Tests (macos-latest)	16m 10s
Java Wordcount Direct Runner (self-hosted, ubuntu-20.04, main)	15m 9s
Java Wordcount Direct Runner (windows-latest)	21m 55s
	1h 39m 51s

Provide feedback