Snap for 8736029 from 8f1564262a5d3b1638d877319ad5aa3e88e02724 to mainline-go-tzdata4-release

Change-Id: I82e5f0913751ff883087a26184245eb9abd52491