Snap for 6872792 from a26f94d312cfe8bec37ef9db05a9d9b56d29a95c to rvc-qpr1-release

Change-Id: I65b69884dab74b3f9a5755b373a79f4fbb66223a
diff --git a/blueline_car/device-common.mk b/blueline_car/device-common.mk
index 63a4ad8..db1faf1 100644
--- a/blueline_car/device-common.mk
+++ b/blueline_car/device-common.mk
@@ -154,4 +154,4 @@
     POSTINSTALL_OPTIONAL_product=false \
 
 # Sepolicy for EVS
-include packages/services/Car/evs/sepolicy/evs.mk
+BOARD_SEPOLICY_DIRS += packages/services/Car/evs/sepolicy
diff --git a/bonito_car/device-common.mk b/bonito_car/device-common.mk
index 3a2978d..471fc0b 100644
--- a/bonito_car/device-common.mk
+++ b/bonito_car/device-common.mk
@@ -131,4 +131,4 @@
 ##############################
 
 # Sepolicy for EVS
-include packages/services/Car/evs/sepolicy/evs.mk
+BOARD_SEPOLICY_DIRS += packages/services/Car/evs/sepolicy
diff --git a/coral_car/device-common.mk b/coral_car/device-common.mk
index adecc94..dcc380b 100644
--- a/coral_car/device-common.mk
+++ b/coral_car/device-common.mk
@@ -122,4 +122,4 @@
 PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true
 
 # Sepolicy for EVS
-include packages/services/Car/evs/sepolicy/evs.mk
+BOARD_SEPOLICY_DIRS += packages/services/Car/evs/sepolicy
diff --git a/crosshatch_car/device-common.mk b/crosshatch_car/device-common.mk
index e44b2b9..da765fb 100644
--- a/crosshatch_car/device-common.mk
+++ b/crosshatch_car/device-common.mk
@@ -160,4 +160,4 @@
     POSTINSTALL_OPTIONAL_product=false \
 
 # Sepolicy for EVS
-include packages/services/Car/evs/sepolicy/evs.mk
+BOARD_SEPOLICY_DIRS += packages/services/Car/evs/sepolicy
diff --git a/flame_car/device-common.mk b/flame_car/device-common.mk
index 9d7d1b9..a3e4606 100644
--- a/flame_car/device-common.mk
+++ b/flame_car/device-common.mk
@@ -122,4 +122,4 @@
 PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true
 
 # Sepolicy for EVS
-include packages/services/Car/evs/sepolicy/evs.mk
+BOARD_SEPOLICY_DIRS += packages/services/Car/evs/sepolicy
diff --git a/sargo_car/device-common.mk b/sargo_car/device-common.mk
index 3a2978d..471fc0b 100644
--- a/sargo_car/device-common.mk
+++ b/sargo_car/device-common.mk
@@ -131,4 +131,4 @@
 ##############################
 
 # Sepolicy for EVS
-include packages/services/Car/evs/sepolicy/evs.mk
+BOARD_SEPOLICY_DIRS += packages/services/Car/evs/sepolicy