Enable Mac80211hwsimUserspaceManaged and require 30.0.4

This change removes the mac80211_hwsim.mac_prefix
kernel command line option (passed by emulator).

Bug: 147493341
Bug: 149778407
Test: boot, check if wifi works
Signed-off-by: Roman Kiryanov <rkir@google.com>
Merged-In: I7fb4d0a679020f64cfd048e0f4cb03f193525c9f
Change-Id: Ic7943a02f0552b9454080f288c23b1c359a31fa0
diff --git a/data/etc/advancedFeatures.ini b/data/etc/advancedFeatures.ini
index c0a0caf..92c3774 100644
--- a/data/etc/advancedFeatures.ini
+++ b/data/etc/advancedFeatures.ini
@@ -16,3 +16,4 @@
 MultiDisplay = on
 VulkanNullOptionalStrings = on
 VulkanIgnoredHandles = on
+Mac80211hwsimUserspaceManaged = on
diff --git a/data/etc/google/user/advancedFeatures.ini b/data/etc/google/user/advancedFeatures.ini
index ed35ec6..4b7cb33 100644
--- a/data/etc/google/user/advancedFeatures.ini
+++ b/data/etc/google/user/advancedFeatures.ini
@@ -17,3 +17,4 @@
 Vulkan = on
 VulkanNullOptionalStrings = on
 VulkanIgnoredHandles = on
+Mac80211hwsimUserspaceManaged = on
diff --git a/data/etc/google/userdebug/advancedFeatures.ini b/data/etc/google/userdebug/advancedFeatures.ini
index ed35ec6..4b7cb33 100644
--- a/data/etc/google/userdebug/advancedFeatures.ini
+++ b/data/etc/google/userdebug/advancedFeatures.ini
@@ -17,3 +17,4 @@
 Vulkan = on
 VulkanNullOptionalStrings = on
 VulkanIgnoredHandles = on
+Mac80211hwsimUserspaceManaged = on
diff --git a/emulator-info.txt b/emulator-info.txt
index c2f1fdc..1ae560d 100644
--- a/emulator-info.txt
+++ b/emulator-info.txt
@@ -1,2 +1,2 @@
 # Emulator (stable) version
-require version-emulator=6185563
+require version-emulator=6278574