Replace ICU.getTZDataVersion usage with the new ICU4J TimeZone.getTZDataVersion am: f12d433314
am: 08870696a5

Change-Id: I1e4d0a6fa6eeae224635eecdf7e67c9a3077a6b8