Snap for 8730993 from 4e4201457e5f51a132101c611c79ccff9f713c8b to mainline-tzdata3-release

Change-Id: I8c7d4dd2dae5ae34360857d359ae3a52d87c17f0