Merge Android R

Bug: 168057903
Merged-In: Ic43dc2b316898ebb8e5505ce0c2d2908abad5fd2
Change-Id: If13e94e93e2beaf8e886b455c752b1e32cd3ceaf
diff --git a/manifest.xml b/manifest.xml
index fee2945..10362de 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -142,22 +142,4 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.wifi.hostapd</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>IHostapd</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.wifi.supplicant</name>
-        <transport>hwbinder</transport>
-        <version>1.2</version>
-        <interface>
-            <name>ISupplicant</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
 </manifest>