Merge "Revert atest unroot device preparer before running tests."
diff --git a/res/config/atest.xml b/res/config/atest.xml
index 2dbfed5..e2afcc6 100644
--- a/res/config/atest.xml
+++ b/res/config/atest.xml
@@ -14,9 +14,5 @@
      limitations under the License.
 -->
 <configuration description="Points to the TF entry point runner for atest.">
-  <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">
-    <option name="force-root" value="false" />
-  </target_preparer>
-
   <test class="com.android.tradefed.testtype.suite.AtestRunner" />
 </configuration>