Snap for 8730993 from 1b5f81aaf1952b0026c090a4b9c36b86b1fb56db to mainline-tzdata3-release

Change-Id: I993f2c494c462b0d7a5a05f193f0827c87ae904f