Snap for 8603585 from c8aec5c18160241e9b5bc79bbc3580e13df5ab23 to mainline-tzdata3-release

Change-Id: Ic6cb16e2e6b280b2aa5e195798558ad5e97ea595