Snap for 8730993 from 25eeb20a8e9600e0d386b8ff1c8a20665b9489b7 to mainline-tzdata3-release

Change-Id: I4e91a876fc69f47cce5a7bc5378bed9188e1625c