Snap for 6886900 from 06dc00c95814a118a3c279d6079a1afd7f2ab6f3 to rvc-qpr2-release

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