Snap for 7803083 from bbe80a782f0687c82a15e41c60786794917460e2 to mainline-tzdata2-release

Change-Id: I7cb72be16b57da75f0c7bf02ec14c766a0316e10