fix incorrection assumption due to DST

Bug: 19685371
Change-Id: I4828590316a9bcd50669579359f8b60d80011908
diff --git a/hostsidetests/aadb/src/com/android/cts/aadb/TestDeviceFuncTest.java b/hostsidetests/aadb/src/com/android/cts/aadb/TestDeviceFuncTest.java
index 9f69242..a036382 100644
--- a/hostsidetests/aadb/src/com/android/cts/aadb/TestDeviceFuncTest.java
+++ b/hostsidetests/aadb/src/com/android/cts/aadb/TestDeviceFuncTest.java
@@ -294,7 +294,11 @@
             String deviceTimezone = mTestDevice.getProperty("persist.sys.timezone");
             if (deviceTimezone != null) {
                 TimeZone tz = TimeZone.getTimeZone(deviceTimezone);
-                tmpFile.setLastModified(tmpFile.lastModified() + tz.getRawOffset());
+                long timestamp = tmpFile.lastModified() + tz.getRawOffset();
+                if (tz.observesDaylightTime()) {
+                    timestamp += tz.getDSTSavings();
+                }
+                tmpFile.setLastModified(timestamp);
             }
 
             assertTrue(mTestDevice.syncFiles(tmpDir, externalStorePath));