[automerger skipped] Disable vendor path check for mainline variants
am: 2c5def62dc -s ours
am skip reason: change_id I607781ce7c6299cbc98c54c683d04db3b65c2e21 with SHA1 42127e0213 is in history

Change-Id: I76d70443a8acf96a19fc8b7f276bd3896e93b2c3
diff --git a/target/product/mainline_system_x86.mk b/target/product/mainline_system_x86.mk
index 830a2ed..ac33068 100644
--- a/target/product/mainline_system_x86.mk
+++ b/target/product/mainline_system_x86.mk
@@ -37,5 +37,4 @@
 PRODUCT_DEVICE := mainline_x86
 PRODUCT_BRAND := generic
 PRODUCT_SHIPPING_API_LEVEL := 28
-# TODO(b/137033385): change this back to "all"
-PRODUCT_RESTRICT_VENDOR_FILES := owner
+PRODUCT_RESTRICT_VENDOR_FILES := all
diff --git a/target/product/mainline_system_x86_arm.mk b/target/product/mainline_system_x86_arm.mk
index 3c06652..0ed86cc 100644
--- a/target/product/mainline_system_x86_arm.mk
+++ b/target/product/mainline_system_x86_arm.mk
@@ -37,5 +37,4 @@
 PRODUCT_DEVICE := mainline_x86_arm
 PRODUCT_BRAND := generic
 PRODUCT_SHIPPING_API_LEVEL := 28
-# TODO(b/137033385): change this back to "all"
-PRODUCT_RESTRICT_VENDOR_FILES := owner
+PRODUCT_RESTRICT_VENDOR_FILES := all