Snap for 8817865 from c044b3738e17ee4f81fd1b14d8af3916ad28b0e5 to mainline-go-tzdata4-release

Change-Id: Ifbb971a8d3d85d8cf72bc7dcb22b024dccc7f815