Snap for 8857176 from aa389ab5e88aaad197ce927092f4871bb2ec2b32 to mainline-go-tzdata4-release

Change-Id: I8c5e694f51356fc551061c1df33d1903b2192a5d