Snap for 11566117 from 41d2d3df047920f2b137f4f949f38aad89c9a7ac to sdk-release

Change-Id: I657ac3d360d55c6628bf440033ccf41b80d37da5
diff --git a/hostsidetests/rollback/AndroidTest.xml b/hostsidetests/rollback/AndroidTest.xml
index 35e7cda..89fd419 100644
--- a/hostsidetests/rollback/AndroidTest.xml
+++ b/hostsidetests/rollback/AndroidTest.xml
@@ -24,6 +24,10 @@
         <option name="test-file-name" value="CtsRootRollbackManagerHostTestHelperApp.apk" />
     </target_preparer>
     <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />
+    <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+        <option name="auto-update-time" value="OFF"/>
+        <option name="auto-update-timezone" value="OFF"/>
+    </target_preparer>
     <test class="com.android.tradefed.testtype.HostTest" >
         <option name="class" value="com.android.cts_root.rollback.host.RollbackManagerHostTest" />
     </test>