Snap for 12337407 from 8211a60d80f3e989313ad566ffdbff161c3af57c to 25Q1-release

Change-Id: I111ba6bf77068cd436d2dd24458981fe48cc8023
diff --git a/tracking_denials/bug_map b/tracking_denials/bug_map
index a81c684..e499aaa 100644
--- a/tracking_denials/bug_map
+++ b/tracking_denials/bug_map
@@ -1,4 +1,5 @@
 
+battery_mitigation sysfs file b/364446534
 chre vendor_data_file dir b/301948771
 dump_display sysfs file b/340722772
 hal_power_default hal_power_default capability b/240632824
diff --git a/whitechapel/vendor/google/device.te b/whitechapel/vendor/google/device.te
index 4662a07..1e1f25d 100644
--- a/whitechapel/vendor/google/device.te
+++ b/whitechapel/vendor/google/device.te
@@ -1,8 +1,5 @@
 # Block Devices
-type efs_block_device, dev_type;
 type modem_block_device, dev_type;
-type modem_userdata_block_device, dev_type;
-type persist_block_device, dev_type;
 type mfg_data_block_device, dev_type;
 
 # Exynos devices
@@ -39,3 +36,4 @@
 
 # GPS
 type vendor_gnss_device, dev_type;
+
diff --git a/whitechapel/vendor/google/file.te b/whitechapel/vendor/google/file.te
index 16c4044..db4d057 100644
--- a/whitechapel/vendor/google/file.te
+++ b/whitechapel/vendor/google/file.te
@@ -161,3 +161,4 @@
 
 # WLC
 type sysfs_wlc, sysfs_type, fs_type;
+
diff --git a/whitechapel/vendor/google/genfs_contexts b/whitechapel/vendor/google/genfs_contexts
index 99875eb..2a0642d 100644
--- a/whitechapel/vendor/google/genfs_contexts
+++ b/whitechapel/vendor/google/genfs_contexts
@@ -152,6 +152,8 @@
 genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/panel_need_handle_idle_exit    u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/1c2c0000.drmdsim/1c2c0000.drmdsim.0/time_in_state                  u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/time_in_state                  u:object_r:sysfs_display:s0
+genfscon sysfs /devices/platform/1c2c0000.drmdsim/1c2c0000.drmdsim.0/power_mode                     u:object_r:sysfs_display:s0
+genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/power_mode                     u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/1c2c0000.drmdsim/hs_clock                                          u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/1c2d0000.drmdsim/hs_clock                                          u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/1c300000.drmdecon/counters                                         u:object_r:sysfs_display:s0