Enable 'fwk_devicestate_service' in 202404 builds

Bug: 362601542
Test: Successful build
Change-Id: Ic7e659d8462a5bfc9753c7f3b31bef59e64c12e6
diff --git a/private/compat/202404/202404.ignore.cil b/private/compat/202404/202404.ignore.cil
index f518eac..0bf3f7e 100644
--- a/private/compat/202404/202404.ignore.cil
+++ b/private/compat/202404/202404.ignore.cil
@@ -7,7 +7,6 @@
   ( new_objects
     bluetooth_finder_prop
     profcollectd_etr_prop
-    fwk_devicestate_service
     fstype_prop
     binderfs_logs_transactions
     binderfs_logs_transaction_history
diff --git a/private/service.te b/private/service.te
index c12c1a0..7e89300 100644
--- a/private/service.te
+++ b/private/service.te
@@ -11,6 +11,7 @@
 type communal_service,               app_api_service, system_server_service, service_manager_type;
 type dynamic_system_service,         system_api_service, system_server_service, service_manager_type;
 type feature_flags_service,          app_api_service, system_server_service, service_manager_type;
+type fwk_devicestate_service, system_server_service, service_manager_type;
 type gsi_service,                    service_manager_type;
 type incidentcompanion_service,      app_api_service, system_api_service, system_server_service, service_manager_type;
 type logcat_service,                 system_server_service, service_manager_type;
diff --git a/private/service_contexts b/private/service_contexts
index 77f1eec..23e4f77 100644
--- a/private/service_contexts
+++ b/private/service_contexts
@@ -3,9 +3,7 @@
 android.frameworks.stats.IStats/default                              u:object_r:fwk_stats_service:s0
 android.frameworks.sensorservice.ISensorManager/default              u:object_r:fwk_sensor_service:s0
 android.frameworks.vibrator.IVibratorControlService/default          u:object_r:fwk_vibrator_control_service:s0
-starting_at_board_api(202504, `
-    android.frameworks.devicestate.IDeviceStateService/default           u:object_r:fwk_devicestate_service:s0
-')
+android.frameworks.devicestate.IDeviceStateService/default           u:object_r:fwk_devicestate_service:s0
 android.hardware.audio.core.IConfig/default                          u:object_r:hal_audio_service:s0
 # 'default' IModule is equivalent to 'primary' in HIDL
 android.hardware.audio.core.IModule/default                          u:object_r:hal_audio_service:s0
diff --git a/public/service.te b/public/service.te
index 2b75cc6..854ceef 100644
--- a/public/service.te
+++ b/public/service.te
@@ -151,9 +151,6 @@
     type forensic_service, app_api_service, system_api_service, system_server_service, service_manager_type;
 ')
 type fwk_altitude_service, system_server_service, service_manager_type;
-starting_at_board_api(202504, `
-    type fwk_devicestate_service, system_server_service, service_manager_type;
-')
 type fwk_stats_service, app_api_service, system_server_service, service_manager_type;
 type fwk_sensor_service, system_server_service, service_manager_type;
 type fwk_vibrator_control_service, system_server_service, service_manager_type;