Change test type from InstrumentationTest to AndroidJUnitTest

Details about test configs changes are tracked in doc
https://docs.google.com/document/d/1EWUjJ7fjy8ge_Nk0YQbFdRp8DSHo3z6GU0R8jLgrAcw/edit#

Bug: 35882476
Test: local test
Change-Id: Icce2ff1cc424a1e021f30ea525f5256403899583
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index dcb1f39..e3b8607 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -20,7 +20,7 @@
 
     <option name="test-suite-tag" value="apct" />
     <option name="test-tag" value="RetailDemoTests" />
-    <test class="com.android.tradefed.testtype.InstrumentationTest" >
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="com.android.retaildemo.tests" />
         <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
     </test>