Merge "Revert "frameworks/base/wifi/tests: Run mts-wifi on AOSP builds"" into rvc-dev
diff --git a/wifi/tests/AndroidTest.xml b/wifi/tests/AndroidTest.xml
index ea5043a..34e2e3a 100644
--- a/wifi/tests/AndroidTest.xml
+++ b/wifi/tests/AndroidTest.xml
@@ -30,9 +30,5 @@
     <object type="module_controller"
             class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
         <option name="mainline-module-package-name" value="com.google.android.wifi" />
-        <!-- TODO(b/151836001): com.android.wifi doesn't guarantee it is a Mainline module since
-              it could still be OEM customized. Workaround so that this test will still run on
-              AOSP builds. -->
-        <option name="mainline-module-package-name" value="com.android.wifi" />
     </object>
 </configuration>