diff --git a/prebuilts/api/202504/202504_general_sepolicy.conf b/prebuilts/api/202504/202504_general_sepolicy.conf
index 19c4234..be3c5f9 100644
--- a/prebuilts/api/202504/202504_general_sepolicy.conf
+++ b/prebuilts/api/202504/202504_general_sepolicy.conf
@@ -17067,6 +17067,11 @@
 type hal_graphics_mapper_service, hal_service_type, service_manager_type;
 type hal_health_service, protected_service, hal_service_type, service_manager_type;
 type hal_health_storage_service, protected_service, hal_service_type, service_manager_type;
+
+#line 329
+    type hal_hwcrypto_service, protected_service, hal_service_type, service_manager_type;
+#line 331
+
 type hal_identity_service, protected_service, hal_service_type, service_manager_type;
 type hal_input_processor_service, protected_service, hal_service_type, service_manager_type;
 type hal_ir_service, protected_service, hal_service_type, service_manager_type;
@@ -17075,9 +17080,9 @@
 type hal_light_service, protected_service, hal_service_type, service_manager_type;
 type hal_macsec_service, protected_service, hal_service_type, service_manager_type;
 
-#line 336
+#line 339
     type hal_mediaquality_service, protected_service, hal_service_type, service_manager_type;
-#line 338
+#line 341
 
 type hal_memtrack_service, protected_service, hal_service_type, service_manager_type;
 type hal_neuralnetworks_service, hal_service_type, service_manager_type;
@@ -17116,9 +17121,9 @@
 type hal_wifi_supplicant_service, protected_service, hal_service_type, service_manager_type;
 type hal_gatekeeper_service, protected_service, hal_service_type, service_manager_type;
 
-#line 375
+#line 378
     type hal_vm_capabilities_service, protected_service, hal_service_type, service_manager_type;
-#line 377
+#line 380
 
 
 # system/sepolicy/public is for vendor-facing type and attribute definitions.
@@ -56752,56 +56757,75 @@
 #line 9
 
 #line 9
+allow mmd mmd_shared_status_prop:property_service set;
+#line 9
+
+#line 9
+allow mmd mmd_shared_status_prop:file { getattr open read map };
+#line 9
+
+#line 9
+
+
+#line 10
+
+#line 10
+allow mmd property_socket:sock_file write;
+#line 10
+allow mmd init:unix_stream_socket connectto;
+#line 10
+
+#line 10
 allow mmd mmd_status_prop:property_service set;
-#line 9
+#line 10
 
-#line 9
+#line 10
 allow mmd mmd_status_prop:file { getattr open read map };
-#line 9
-
-#line 9
-
+#line 10
 
 #line 10
+
+
+#line 11
 allow mmd mmd_prop:file { getattr open read map };
-#line 10
-
-
 #line 11
+
+
+#line 12
 allow mmd device_config_mmd_native_prop:file { getattr open read map };
-#line 11
+#line 12
 
 
 # mmd binder setup
 
-#line 14
+#line 15
   allow mmd mmd_service:service_manager { add find };
-#line 14
+#line 15
   neverallow { domain -mmd } mmd_service:service_manager add;
-#line 14
+#line 15
 
-#line 14
+#line 15
   # On debug builds with root, allow binder services to use binder over TCP.
-#line 14
+#line 15
   # Not using rw_socket_perms_no_ioctl to avoid granting too many permissions.
-#line 14
+#line 15
   
-#line 14
-
-
 #line 15
+
+
+#line 16
 # Call the servicemanager and transfer references to it.
-#line 15
+#line 16
 allow mmd servicemanager:binder { call transfer };
-#line 15
+#line 16
 # Allow servicemanager to send out callbacks
-#line 15
+#line 16
 allow servicemanager mmd:binder { call transfer };
-#line 15
+#line 16
 # rw access to /dev/binder and /dev/ashmem is presently granted to
-#line 15
+#line 16
 # all domains in domain.te.
-#line 15
+#line 16
 
 
 # Read /proc/swaps
@@ -56823,29 +56847,29 @@
 
 # Allow mmd to write to statsd socket.
 
-#line 35
+#line 36
 allow mmd statsdw_socket:sock_file write;
-#line 35
+#line 36
 allow mmd statsd:unix_dgram_socket sendto;
-#line 35
+#line 36
 
 # Allow mmd to interact with statsd binder calls for pulled atoms.
 allow mmd stats_service:service_manager find;
 allow mmd statsmanager_service:service_manager find;
 
-#line 39
+#line 40
 # Call the server domain and optionally transfer references to it.
-#line 39
+#line 40
 allow mmd statsd:binder { call transfer };
-#line 39
+#line 40
 # Allow the serverdomain to transfer references to the client on the reply.
-#line 39
+#line 40
 allow statsd mmd:binder transfer;
-#line 39
+#line 40
 # Receive and use open files from the server.
-#line 39
+#line 40
 allow mmd statsd:fd use;
-#line 39
+#line 40
 
 #line 1 "system/sepolicy/private/modprobe.te"
 typeattribute modprobe coredomain;
@@ -63137,257 +63161,278 @@
 #line 89
   
 #line 89
+  type mmd_shared_status_prop, property_type, system_property_type, system_restricted_property_type;
+#line 89
+
+#line 89
+  # BEGIN_LAUNCHING_WITH_R_ONLY -- this marker is used by CTS -- do not modify
+#line 89
+
+#line 89
+    neverallow { domain -coredomain } mmd_shared_status_prop:property_service set;
+#line 89
+  
+#line 89
+# END_LAUNCHING_WITH_R_ONLY -- this marker is used by CTS -- do not modify
+#line 89
+
+#line 89
+
+
+#line 90
+  
+#line 90
   type persist_sysui_builder_extras_prop, property_type, system_property_type, system_restricted_property_type;
-#line 89
+#line 90
 
-#line 89
+#line 90
   # BEGIN_LAUNCHING_WITH_R_ONLY -- this marker is used by CTS -- do not modify
-#line 89
+#line 90
 
-#line 89
+#line 90
     neverallow { domain -coredomain } persist_sysui_builder_extras_prop:property_service set;
-#line 89
+#line 90
   
-#line 89
+#line 90
 # END_LAUNCHING_WITH_R_ONLY -- this marker is used by CTS -- do not modify
-#line 89
-
-#line 89
-
+#line 90
 
 #line 90
+
+
+#line 91
   
-#line 90
+#line 91
   type persist_sysui_ranking_update_prop, property_type, system_property_type, system_restricted_property_type;
-#line 90
+#line 91
 
-#line 90
+#line 91
   # BEGIN_LAUNCHING_WITH_R_ONLY -- this marker is used by CTS -- do not modify
-#line 90
+#line 91
 
-#line 90
+#line 91
     neverallow { domain -coredomain } persist_sysui_ranking_update_prop:property_service set;
-#line 90
+#line 91
   
-#line 90
+#line 91
 # END_LAUNCHING_WITH_R_ONLY -- this marker is used by CTS -- do not modify
-#line 90
-
-#line 90
-
+#line 91
 
 #line 91
+
+
+#line 92
   
-#line 91
+#line 92
   type page_size_prop, property_type, system_property_type, system_restricted_property_type;
-#line 91
+#line 92
 
-#line 91
+#line 92
   # BEGIN_LAUNCHING_WITH_R_ONLY -- this marker is used by CTS -- do not modify
-#line 91
+#line 92
 
-#line 91
+#line 92
     neverallow { domain -coredomain } page_size_prop:property_service set;
-#line 91
+#line 92
   
-#line 91
+#line 92
 # END_LAUNCHING_WITH_R_ONLY -- this marker is used by CTS -- do not modify
-#line 91
-
-#line 91
-
+#line 92
 
 #line 92
+
+
+#line 93
   
-#line 92
+#line 93
   type pm_16kb_app_compat_prop, property_type, system_property_type, system_restricted_property_type;
-#line 92
+#line 93
 
-#line 92
+#line 93
   # BEGIN_LAUNCHING_WITH_R_ONLY -- this marker is used by CTS -- do not modify
-#line 92
+#line 93
 
-#line 92
+#line 93
     neverallow { domain -coredomain } pm_16kb_app_compat_prop:property_service set;
-#line 92
+#line 93
   
-#line 92
+#line 93
 # END_LAUNCHING_WITH_R_ONLY -- this marker is used by CTS -- do not modify
-#line 92
+#line 93
 
-#line 92
+#line 93
 
 
 
 # Properties with no restrictions
-#line 100
+#line 101
 
 
 # These types will be public starting at board api 202504
-#line 106
+#line 107
 
 
 # These types will be public starting at board api 202504
-#line 111
+#line 112
 
 
 # Properties which should only be written by vendor_init
 
-#line 114
+#line 115
   
-#line 114
+#line 115
   type avf_virtualizationservice_prop, property_type, system_property_type, system_public_property_type;
-#line 114
+#line 115
 
-#line 114
+#line 115
   
-#line 114
+#line 115
 
-#line 114
+#line 115
 allow vendor_init property_socket:sock_file write;
-#line 114
+#line 115
 allow vendor_init init:unix_stream_socket connectto;
-#line 114
+#line 115
 
-#line 114
+#line 115
 allow vendor_init avf_virtualizationservice_prop:property_service set;
-#line 114
+#line 115
 
-#line 114
+#line 115
 allow vendor_init avf_virtualizationservice_prop:file { getattr open read map };
-#line 114
+#line 115
 
-#line 114
+#line 115
 
-#line 114
+#line 115
   neverallow { domain -init -vendor_init } avf_virtualizationservice_prop:property_service set;
-#line 114
-
-#line 117
-
+#line 115
 
 #line 118
+
+
+#line 119
   
-#line 118
+#line 119
   type high_barometer_quality_prop, property_type, system_property_type, system_public_property_type;
-#line 118
+#line 119
 
-#line 118
+#line 119
   
-#line 118
+#line 119
 
-#line 118
+#line 119
 allow vendor_init property_socket:sock_file write;
-#line 118
+#line 119
 allow vendor_init init:unix_stream_socket connectto;
-#line 118
+#line 119
 
-#line 118
+#line 119
 allow vendor_init high_barometer_quality_prop:property_service set;
-#line 118
+#line 119
 
-#line 118
+#line 119
 allow vendor_init high_barometer_quality_prop:file { getattr open read map };
-#line 118
+#line 119
 
-#line 118
+#line 119
 
-#line 118
+#line 119
   neverallow { domain -init -vendor_init } high_barometer_quality_prop:property_service set;
-#line 118
-
-
 #line 119
+
+
+#line 120
   
-#line 119
+#line 120
   type mmd_prop, property_type, system_property_type, system_public_property_type;
-#line 119
+#line 120
 
-#line 119
+#line 120
   
-#line 119
+#line 120
 
-#line 119
+#line 120
 allow vendor_init property_socket:sock_file write;
-#line 119
+#line 120
 allow vendor_init init:unix_stream_socket connectto;
-#line 119
+#line 120
 
-#line 119
+#line 120
 allow vendor_init mmd_prop:property_service set;
-#line 119
+#line 120
 
-#line 119
+#line 120
 allow vendor_init mmd_prop:file { getattr open read map };
-#line 119
+#line 120
 
-#line 119
+#line 120
 
-#line 119
+#line 120
   neverallow { domain -init -vendor_init } mmd_prop:property_service set;
-#line 119
-
-
 #line 120
+
+
+#line 121
   
-#line 120
+#line 121
   type mmd_shared_prop, property_type, system_property_type, system_public_property_type;
-#line 120
+#line 121
 
-#line 120
+#line 121
   
-#line 120
+#line 121
 
-#line 120
+#line 121
 allow vendor_init property_socket:sock_file write;
-#line 120
+#line 121
 allow vendor_init init:unix_stream_socket connectto;
-#line 120
+#line 121
 
-#line 120
+#line 121
 allow vendor_init mmd_shared_prop:property_service set;
-#line 120
+#line 121
 
-#line 120
+#line 121
 allow vendor_init mmd_shared_prop:file { getattr open read map };
-#line 120
+#line 121
 
-#line 120
+#line 121
 
-#line 120
+#line 121
   neverallow { domain -init -vendor_init } mmd_shared_prop:property_service set;
-#line 120
-
-
 #line 121
+
+
+#line 122
   
-#line 121
+#line 122
   type prefetch_boot_prop, property_type, system_property_type, system_public_property_type;
-#line 121
+#line 122
 
-#line 121
+#line 122
   
-#line 121
+#line 122
 
-#line 121
+#line 122
 allow vendor_init property_socket:sock_file write;
-#line 121
+#line 122
 allow vendor_init init:unix_stream_socket connectto;
-#line 121
+#line 122
 
-#line 121
+#line 122
 allow vendor_init prefetch_boot_prop:property_service set;
-#line 121
+#line 122
 
-#line 121
+#line 122
 allow vendor_init prefetch_boot_prop:file { getattr open read map };
-#line 121
+#line 122
 
-#line 121
+#line 122
 
-#line 121
+#line 122
   neverallow { domain -init -vendor_init } prefetch_boot_prop:property_service set;
-#line 121
+#line 122
 
 
 typeattribute log_prop log_property_type;
@@ -63433,91 +63478,91 @@
 ###
 
 # BEGIN_LAUNCHING_WITH_R_ONLY -- this marker is used by CTS -- do not modify
-#line 165
+#line 166
 
-#line 165
+#line 166
 
-#line 165
+#line 166
 # BEGIN_LAUNCHING_WITH_S_ONLY -- this marker is used by CTS -- do not modify
-#line 165
+#line 166
 
-#line 165
+#line 166
   neverallow domain {
-#line 165
+#line 166
     property_type
-#line 165
+#line 166
     -system_property_type
-#line 165
+#line 166
     -system_property_type
-#line 165
+#line 166
     -vendor_property_type
-#line 165
+#line 166
   }:file { { append create link unlink relabelfrom rename setattr write } open read ioctl lock watch watch_mount watch_sb watch_with_perm watch_reads };
-#line 165
+#line 166
 
-#line 165
+#line 166
 # END_LAUNCHING_WITH_S_ONLY -- this marker is used by CTS -- do not modify
-#line 165
+#line 166
 
-#line 165
+#line 166
 
-#line 165
+#line 166
 neverallow { domain -coredomain } {
-#line 165
+#line 166
   system_property_type
-#line 165
+#line 166
   system_internal_property_type
-#line 165
+#line 166
   -system_restricted_property_type
-#line 165
+#line 166
   -system_public_property_type
-#line 165
+#line 166
 }:file { { append create link unlink relabelfrom rename setattr write } open read ioctl lock watch watch_mount watch_sb watch_with_perm watch_reads };
-#line 165
+#line 166
 
-#line 165
+#line 166
 neverallow { domain -coredomain } {
-#line 165
+#line 166
   system_property_type
-#line 165
+#line 166
   -system_public_property_type
-#line 165
+#line 166
 }:property_service set;
-#line 165
+#line 166
 
-#line 165
+#line 166
 # init is in coredomain, but should be able to read/write all props.
-#line 165
+#line 166
 # dumpstate is also in coredomain, but should be able to read all props.
-#line 165
+#line 166
 neverallow { coredomain -init -dumpstate } {
-#line 165
+#line 166
   vendor_property_type
-#line 165
+#line 166
   vendor_internal_property_type
-#line 165
+#line 166
   -vendor_restricted_property_type
-#line 165
+#line 166
   -vendor_public_property_type
-#line 165
+#line 166
 }:file { { append create link unlink relabelfrom rename setattr write } open read ioctl lock watch watch_mount watch_sb watch_with_perm watch_reads };
-#line 165
+#line 166
 
-#line 165
+#line 166
 neverallow { coredomain -init } {
-#line 165
+#line 166
   vendor_property_type
-#line 165
+#line 166
   -vendor_public_property_type
-#line 165
+#line 166
 }:property_service set;
-#line 165
+#line 166
 
-#line 165
+#line 166
 
-#line 165
+#line 166
 # END_LAUNCHING_WITH_R_ONLY -- this marker is used by CTS -- do not modify
-#line 202
+#line 203
 
 
 # There is no need to perform ioctl or advisory locking operations on
@@ -63609,429 +63654,429 @@
 } misctrl_prop:property_service set;
 
 # BEGIN_COMPATIBLE_PROPERTY_ONLY -- this marker is used by CTS -- do not modify
-#line 292
+#line 293
 
-#line 292
+#line 293
 # Prevent properties from being set
-#line 292
+#line 293
   neverallow {
-#line 292
+#line 293
     domain
-#line 292
+#line 293
     -coredomain
-#line 292
+#line 293
     -appdomain
-#line 292
+#line 293
     -vendor_init
-#line 292
+#line 293
   } {
-#line 292
+#line 293
     core_property_type
-#line 292
+#line 293
     extended_core_property_type
-#line 292
+#line 293
     exported_config_prop
-#line 292
+#line 293
     exported_default_prop
-#line 292
+#line 293
     exported_dumpstate_prop
-#line 292
+#line 293
     exported_system_prop
-#line 292
+#line 293
     exported3_system_prop
-#line 292
+#line 293
     usb_control_prop
-#line 292
+#line 293
     -nfc_prop
-#line 292
+#line 293
     -powerctl_prop
-#line 292
+#line 293
     -radio_prop
-#line 292
+#line 293
   }:property_service set;
-#line 292
+#line 293
 
-#line 292
+#line 293
   neverallow {
-#line 292
+#line 293
     domain
-#line 292
+#line 293
     -coredomain
-#line 292
+#line 293
     -appdomain
-#line 292
+#line 293
     -hal_nfc_server
-#line 292
+#line 293
   } {
-#line 292
+#line 293
     nfc_prop
-#line 292
+#line 293
   }:property_service set;
-#line 292
+#line 293
 
-#line 292
+#line 293
   neverallow {
-#line 292
+#line 293
     domain
-#line 292
+#line 293
     -coredomain
-#line 292
+#line 293
     -appdomain
-#line 292
+#line 293
     -hal_telephony_server
-#line 292
+#line 293
     -vendor_init
-#line 292
+#line 293
   } {
-#line 292
+#line 293
     radio_control_prop
-#line 292
+#line 293
   }:property_service set;
-#line 292
+#line 293
 
-#line 292
+#line 293
   neverallow {
-#line 292
+#line 293
     domain
-#line 292
+#line 293
     -coredomain
-#line 292
+#line 293
     -appdomain
-#line 292
+#line 293
     -hal_telephony_server
-#line 292
+#line 293
   } {
-#line 292
+#line 293
     radio_prop
-#line 292
+#line 293
   }:property_service set;
-#line 292
+#line 293
 
-#line 292
+#line 293
   neverallow {
-#line 292
+#line 293
     domain
-#line 292
+#line 293
     -coredomain
-#line 292
+#line 293
     -bluetooth
-#line 292
+#line 293
     -hal_bluetooth_server
-#line 292
+#line 293
   } {
-#line 292
+#line 293
     bluetooth_prop
-#line 292
+#line 293
   }:property_service set;
-#line 292
+#line 293
 
-#line 292
+#line 293
   neverallow {
-#line 292
+#line 293
     domain
-#line 292
+#line 293
     -coredomain
-#line 292
+#line 293
     -bluetooth
-#line 292
+#line 293
     -hal_bluetooth_server
-#line 292
+#line 293
     -vendor_init
-#line 292
+#line 293
   } {
-#line 292
+#line 293
     exported_bluetooth_prop
-#line 292
+#line 293
   }:property_service set;
-#line 292
+#line 293
 
-#line 292
+#line 293
   neverallow {
-#line 292
+#line 293
     domain
-#line 292
+#line 293
     -coredomain
-#line 292
+#line 293
     -hal_camera_server
-#line 292
+#line 293
     -cameraserver
-#line 292
+#line 293
     -vendor_init
-#line 292
+#line 293
   } {
-#line 292
+#line 293
     exported_camera_prop
-#line 292
+#line 293
   }:property_service set;
-#line 292
+#line 293
 
-#line 292
+#line 293
   neverallow {
-#line 292
+#line 293
     domain
-#line 292
+#line 293
     -coredomain
-#line 292
+#line 293
     -hal_wifi_server
-#line 292
+#line 293
     -wificond
-#line 292
+#line 293
   } {
-#line 292
+#line 293
     wifi_prop
-#line 292
+#line 293
   }:property_service set;
-#line 292
+#line 293
 
-#line 292
+#line 293
   neverallow {
-#line 292
+#line 293
     domain
-#line 292
+#line 293
     -init
-#line 292
+#line 293
     -dumpstate
-#line 292
+#line 293
     -hal_wifi_server
-#line 292
+#line 293
     -wificond
-#line 292
+#line 293
     -vendor_init
-#line 292
+#line 293
   } {
-#line 292
+#line 293
     wifi_hal_prop
-#line 292
+#line 293
   }:property_service set;
-#line 292
+#line 293
 
-#line 292
+#line 293
 # Prevent properties from being read
-#line 292
+#line 293
   neverallow {
-#line 292
+#line 293
     domain
-#line 292
+#line 293
     -coredomain
-#line 292
+#line 293
     -appdomain
-#line 292
+#line 293
     -vendor_init
-#line 292
+#line 293
   } {
-#line 292
+#line 293
     core_property_type
-#line 292
+#line 293
     dalvik_config_prop_type
-#line 292
+#line 293
     extended_core_property_type
-#line 292
+#line 293
     exported3_system_prop
-#line 292
+#line 293
     systemsound_config_prop
-#line 292
+#line 293
     -debug_prop
-#line 292
+#line 293
     -logd_prop
-#line 292
+#line 293
     -nfc_prop
-#line 292
+#line 293
     -powerctl_prop
-#line 292
+#line 293
     -radio_prop
-#line 292
+#line 293
     -dalvik_dynamic_config_prop
-#line 292
+#line 293
   }:file { { append create link unlink relabelfrom rename setattr write } open read ioctl lock watch watch_mount watch_sb watch_with_perm watch_reads };
-#line 292
+#line 293
 
-#line 292
+#line 293
   neverallow {
-#line 292
+#line 293
     domain
-#line 292
+#line 293
     -coredomain
-#line 292
+#line 293
     -appdomain
-#line 292
+#line 293
     -vendor_init
-#line 292
+#line 293
     -hal_power_server
-#line 292
+#line 293
   } dalvik_dynamic_config_prop:file { { append create link unlink relabelfrom rename setattr write } open read ioctl lock watch watch_mount watch_sb watch_with_perm watch_reads };
-#line 292
+#line 293
 
-#line 292
+#line 293
   neverallow {
-#line 292
+#line 293
     domain
-#line 292
+#line 293
     -coredomain
-#line 292
+#line 293
     -appdomain
-#line 292
+#line 293
     -hal_nfc_server
-#line 292
+#line 293
   } {
-#line 292
+#line 293
     nfc_prop
-#line 292
+#line 293
   }:file { { append create link unlink relabelfrom rename setattr write } open read ioctl lock watch watch_mount watch_sb watch_with_perm watch_reads };
-#line 292
+#line 293
 
-#line 292
+#line 293
   neverallow {
-#line 292
+#line 293
     domain
-#line 292
+#line 293
     -coredomain
-#line 292
+#line 293
     -appdomain
-#line 292
+#line 293
     -hal_telephony_server
-#line 292
+#line 293
   } {
-#line 292
+#line 293
     radio_prop
-#line 292
+#line 293
   }:file { { append create link unlink relabelfrom rename setattr write } open read ioctl lock watch watch_mount watch_sb watch_with_perm watch_reads };
-#line 292
+#line 293
 
-#line 292
+#line 293
   neverallow {
-#line 292
+#line 293
     domain
-#line 292
+#line 293
     -coredomain
-#line 292
+#line 293
     -bluetooth
-#line 292
+#line 293
     -hal_bluetooth_server
-#line 292
+#line 293
   } {
-#line 292
+#line 293
     bluetooth_prop
-#line 292
+#line 293
   }:file { { append create link unlink relabelfrom rename setattr write } open read ioctl lock watch watch_mount watch_sb watch_with_perm watch_reads };
-#line 292
+#line 293
 
-#line 292
+#line 293
   neverallow {
-#line 292
+#line 293
     domain
-#line 292
+#line 293
     -coredomain
-#line 292
+#line 293
     -hal_wifi_server
-#line 292
+#line 293
     -wificond
-#line 292
+#line 293
   } {
-#line 292
+#line 293
     wifi_prop
-#line 292
+#line 293
   }:file { { append create link unlink relabelfrom rename setattr write } open read ioctl lock watch watch_mount watch_sb watch_with_perm watch_reads };
-#line 292
+#line 293
 
-#line 292
+#line 293
   neverallow {
-#line 292
+#line 293
     domain
-#line 292
+#line 293
     -coredomain
-#line 292
+#line 293
     -vendor_init
-#line 292
+#line 293
   } {
-#line 292
+#line 293
     suspend_prop
-#line 292
+#line 293
   }:property_service set;
-#line 292
+#line 293
 
-#line 292
+#line 293
   neverallow {
-#line 292
+#line 293
     domain
-#line 292
+#line 293
     -init
-#line 292
+#line 293
   } {
-#line 292
+#line 293
     suspend_debug_prop
-#line 292
+#line 293
   }:property_service set;
-#line 292
+#line 293
 
-#line 292
+#line 293
   neverallow {
-#line 292
+#line 293
     domain
-#line 292
+#line 293
     -init
-#line 292
+#line 293
     -vendor_init
-#line 292
+#line 293
   } {
-#line 292
+#line 293
     high_barometer_quality_prop
-#line 292
+#line 293
     }:property_service set;
-#line 292
+#line 293
 
-#line 292
+#line 293
   neverallow {
-#line 292
+#line 293
     domain
-#line 292
+#line 293
     -init
-#line 292
+#line 293
     -dumpstate
-#line 292
+#line 293
     
-#line 292
+#line 293
     } {
-#line 292
+#line 293
       suspend_debug_prop
-#line 292
+#line 293
     }:file { { append create link unlink relabelfrom rename setattr write } open read ioctl lock watch watch_mount watch_sb watch_with_perm watch_reads };
-#line 292
+#line 293
 
-#line 292
+#line 293
 # END_COMPATIBLE_PROPERTY_ONLY -- this marker is used by CTS -- do not modify
-#line 485
+#line 486
 
 
 dontaudit system_suspend suspend_debug_prop:file { getattr open read ioctl lock map watch watch_reads };
 
 # BEGIN_COMPATIBLE_PROPERTY_ONLY -- this marker is used by CTS -- do not modify
-#line 489
+#line 490
 
-#line 489
+#line 490
   # Neverallow coredomain to set vendor properties
-#line 489
+#line 490
   neverallow {
-#line 489
+#line 490
     coredomain
-#line 489
+#line 490
     -init
-#line 489
+#line 490
     -system_writes_vendor_properties_violators
-#line 489
+#line 490
   } {
-#line 489
+#line 490
     property_type
-#line 489
+#line 490
     -system_property_type
-#line 489
+#line 490
     -extended_core_property_type
-#line 489
+#line 490
   }:property_service set;
-#line 489
+#line 490
 
-#line 489
+#line 490
 # END_COMPATIBLE_PROPERTY_ONLY -- this marker is used by CTS -- do not modify
-#line 500
+#line 501
 
 
 neverallow {
@@ -66476,38 +66521,39 @@
 
 #line 39
 
+#line 42
 
 
-#line 41
-    type supervision_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
 #line 43
+    type supervision_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
+#line 45
 
 type tracingproxy_service,          system_server_service, service_manager_type;
 type tradeinmode_service,           system_server_service, service_manager_type;
 type transparency_service,          system_server_service, service_manager_type;
 
 
-#line 48
-    type vfio_handler_service,          service_manager_type;
 #line 50
+    type vfio_handler_service,          service_manager_type;
+#line 52
 
 
-#line 51
-    type virtualization_maintenance_service, service_manager_type;
 #line 53
+    type virtualization_maintenance_service, service_manager_type;
+#line 55
 
 
-#line 54
+#line 56
     type vm_tethering_service, system_server_service, service_manager_type;
-#line 54
+#line 56
     type vmnic_service,        service_manager_type;
-#line 57
+#line 59
 
-#line 60
+#line 62
 
 
 type uce_service,                      service_manager_type;
-#line 65
+#line 67
 
 type wearable_sensing_service,         app_api_service, system_server_service, service_manager_type;
 type wifi_mainline_supplicant_service, service_manager_type;
@@ -66515,12 +66561,12 @@
 type advanced_protection_service,      app_api_service, system_server_service, service_manager_type;
 
 
-#line 71
-    type ranging_service, app_api_service, system_server_service, service_manager_type;
 #line 73
+    type ranging_service, app_api_service, system_server_service, service_manager_type;
+#line 75
 
 
-#line 77
+#line 79
 
 
 ###
@@ -83344,72 +83390,77 @@
 
 
 #line 319
-allow vendor_init ota_prop:file { getattr open read map };
+allow vendor_init mmd_shared_status_prop:file { getattr open read map };
 #line 319
 
 
 #line 320
-allow vendor_init power_debug_prop:file { getattr open read map };
+allow vendor_init ota_prop:file { getattr open read map };
 #line 320
 
 
 #line 321
-allow vendor_init provisioned_prop:file { getattr open read map };
+allow vendor_init power_debug_prop:file { getattr open read map };
 #line 321
 
 
 #line 322
-allow vendor_init retaildemo_prop:file { getattr open read map };
+allow vendor_init provisioned_prop:file { getattr open read map };
 #line 322
 
 
 #line 323
-allow vendor_init surfaceflinger_display_prop:file { getattr open read map };
+allow vendor_init retaildemo_prop:file { getattr open read map };
 #line 323
 
 
 #line 324
-allow vendor_init test_harness_prop:file { getattr open read map };
+allow vendor_init surfaceflinger_display_prop:file { getattr open read map };
 #line 324
 
 
 #line 325
-allow vendor_init theme_prop:file { getattr open read map };
+allow vendor_init test_harness_prop:file { getattr open read map };
 #line 325
 
 
 #line 326
-
+allow vendor_init theme_prop:file { getattr open read map };
 #line 326
+
+
+#line 327
+
+#line 327
 allow vendor_init property_socket:sock_file write;
-#line 326
+#line 327
 allow vendor_init init:unix_stream_socket connectto;
-#line 326
+#line 327
 
-#line 326
+#line 327
 allow vendor_init dck_prop:property_service set;
-#line 326
+#line 327
 
-#line 326
+#line 327
 allow vendor_init dck_prop:file { getattr open read map };
-#line 326
+#line 327
 
-#line 326
+#line 327
 
 
 # Allow vendor_init to read vendor_system_native device config changes
 
-#line 329
+#line 330
 allow vendor_init device_config_vendor_system_native_prop:file { getattr open read map };
-#line 329
-
-
 #line 330
+
+
+#line 331
 allow vendor_init device_config_vendor_system_native_boot_prop:file { getattr open read map };
-#line 330
+#line 331
 
 
-#line 334
+#line 335
 
 
 ###
@@ -83418,13 +83469,13 @@
 
 # Vendor init shouldn't communicate with any vendor process, nor most system processes.
 
-#line 341
+#line 342
   neverallow vendor_init {
-#line 341
+#line 342
     domain -init -logd -prng_seeder -su -vendor_init }:{ socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket appletalk_socket netlink_route_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_dnrt_socket netlink_kobject_uevent_socket tun_socket netlink_iscsi_socket netlink_fib_lookup_socket netlink_connector_socket netlink_netfilter_socket netlink_generic_socket netlink_scsitransport_socket netlink_rdma_socket netlink_crypto_socket sctp_socket icmp_socket ax25_socket ipx_socket netrom_socket atmpvc_socket x25_socket rose_socket decnet_socket atmsvc_socket rds_socket irda_socket pppox_socket llc_socket can_socket tipc_socket bluetooth_socket iucv_socket rxrpc_socket isdn_socket phonet_socket ieee802154_socket caif_socket alg_socket nfc_socket vsock_socket kcm_socket qipcrtr_socket smc_socket xdp_socket } { connect sendto };
-#line 341
+#line 342
   neverallow vendor_init {
-#line 341
+#line 342
     domain -init -logd -prng_seeder -su -vendor_init }:unix_stream_socket connectto;
 ;
 
diff --git a/prebuilts/api/202504/202504_mapping.cil b/prebuilts/api/202504/202504_mapping.cil
index 120fca0..2763fd1 100644
--- a/prebuilts/api/202504/202504_mapping.cil
+++ b/prebuilts/api/202504/202504_mapping.cil
@@ -4240,6 +4240,9 @@
 (typeattributeset hal_power_stats_service_202504 (hal_power_stats_service))
 (expandtypeattribute (hal_power_stats_service_202504) true)
 (typeattribute hal_power_stats_service_202504)
+(typeattributeset hal_hwcrypto_service_202504 (hal_hwcrypto_service))
+(expandtypeattribute (hal_hwcrypto_service_202504) true)
+(typeattribute hal_hwcrypto_service_202504)
 (typeattributeset sysfs_ion_202504 (sysfs_ion))
 (expandtypeattribute (sysfs_ion_202504) true)
 (typeattribute sysfs_ion_202504)
diff --git a/prebuilts/api/202504/202504_plat_sepolicy.cil b/prebuilts/api/202504/202504_plat_sepolicy.cil
index 18a0015..e2da1c8 100644
--- a/prebuilts/api/202504/202504_plat_sepolicy.cil
+++ b/prebuilts/api/202504/202504_plat_sepolicy.cil
@@ -743,7 +743,7 @@
 (typeattribute port_type)
 (typeattributeset port_type (port ))
 (typeattribute property_type)
-(typeattributeset property_type (apexd_prop bootloader_boot_reason_prop device_config_activity_manager_native_boot_prop device_config_boot_count_prop device_config_input_native_boot_prop device_config_netd_native_prop device_config_reset_performed_prop firstboot_prop boottime_prop charger_prop cold_boot_done_prop ctl_adbd_prop ctl_apexd_prop ctl_bootanim_prop ctl_bugreport_prop ctl_console_prop ctl_dumpstate_prop ctl_fuse_prop ctl_gsid_prop ctl_interface_restart_prop ctl_interface_stop_prop ctl_mdnsd_prop ctl_restart_prop ctl_rildaemon_prop ctl_sigstop_prop dynamic_system_prop heapprofd_enabled_prop llkd_prop lpdumpd_prop mmc_prop mock_ota_prop net_dns_prop overlay_prop persistent_properties_ready_prop safemode_prop system_lmk_prop system_trace_prop test_boot_reason_prop time_prop traced_enabled_prop traced_lazy_prop aac_drc_prop adaptive_haptics_prop apex_ready_prop arm64_memtag_prop binder_cache_bluetooth_server_prop binder_cache_system_server_prop binder_cache_telephony_server_prop boot_status_prop bootanim_system_prop bootloader_prop boottime_public_prop bq_config_prop build_bootimage_prop build_prop composd_vm_art_prop device_config_aconfig_flags_prop device_config_camera_native_prop device_config_edgetpu_native_prop device_config_media_native_prop device_config_nnapi_native_prop device_config_runtime_native_boot_prop device_config_runtime_native_prop device_config_surface_flinger_native_boot_prop device_config_vendor_system_native_prop device_config_vendor_system_native_boot_prop drm_forcel3_prop fingerprint_prop gwp_asan_prop hal_instrumentation_prop userdebug_or_eng_prop init_service_status_prop libc_debug_prop module_sdkextensions_prop nnapi_ext_deny_product_prop persist_wm_debug_prop power_debug_prop property_service_version_prop provisioned_prop restorecon_prop retaildemo_prop servicemanager_prop smart_idle_maint_enabled_prop socket_hook_prop sqlite_log_prop surfaceflinger_display_prop system_boot_reason_prop system_jvmti_agent_prop traced_oome_heap_session_count_prop ab_update_gki_prop usb_prop userspace_reboot_exported_prop vold_status_prop vts_status_prop enable_16k_pages_prop profcollectd_etr_prop config_prop cppreopt_prop dalvik_prop debuggerd_prop device_logging_prop dhcp_prop dumpstate_prop exported3_system_prop exported_dumpstate_prop exported_secure_prop heapprofd_prop net_radio_prop pan_result_prop persist_debug_prop shell_prop test_harness_prop theme_prop use_memfd_prop vold_prop apexd_config_prop apexd_select_prop aaudio_config_prop apk_verity_prop audio_config_prop bootanim_config_prop bluetooth_config_prop build_attestation_prop build_config_prop build_odm_prop build_vendor_prop camera_calibration_prop camera_config_prop camera2_extensions_prop camerax_extensions_prop charger_config_prop codec2_config_prop composd_vm_vendor_prop cpu_variant_prop debugfs_restriction_prop drm_config_prop drm_service_config_prop exported_camera_prop exported_config_prop exported_default_prop ffs_config_prop framework_watchdog_config_prop graphics_config_prop hdmi_config_prop hw_timeout_multiplier_prop hypervisor_prop hypervisor_restricted_prop incremental_prop input_device_config_prop keyguard_config_prop keystore_config_prop lmkd_config_prop media_config_prop media_variant_prop mediadrm_config_prop mm_events_config_prop oem_unlock_prop ota_build_prop packagemanager_config_prop quick_start_prop recovery_config_prop recovery_usb_config_prop sendbug_config_prop soc_prop storage_config_prop storagemanager_config_prop surfaceflinger_prop suspend_prop systemsound_config_prop telephony_config_prop threadnetwork_config_prop tombstone_config_prop usb_config_prop userspace_reboot_config_prop vehicle_hal_prop vendor_security_patch_level_prop vendor_socket_hook_prop virtual_ab_prop vndk_prop vts_config_prop vold_config_prop wifi_config_prop zram_config_prop zygote_config_prop dck_prop tuner_config_prop usb_uvc_enabled_prop setupwizard_mode_prop pm_archiving_enabled_prop trusty_security_vm_sys_vendor_prop adbd_config_prop audio_prop bluetooth_a2dp_offload_prop bluetooth_audio_hal_prop bluetooth_finder_prop bluetooth_prop bpf_progs_loaded_prop charger_status_prop ctl_default_prop ctl_interface_start_prop ctl_start_prop ctl_stop_prop dalvik_config_prop dalvik_dynamic_config_prop dalvik_runtime_prop debug_prop device_config_memory_safety_native_boot_prop device_config_memory_safety_native_prop dumpstate_options_prop exported_system_prop exported_bluetooth_prop exported_overlay_prop exported_pm_prop future_pm_prop ffs_control_prop framework_status_prop gesture_prop graphics_config_writable_prop hal_dumpstate_config_prop sota_prop hwservicemanager_prop lmkd_prop locale_prop logd_prop logpersistd_logging_prop log_prop log_tag_prop lowpan_prop nfc_prop ota_prop permissive_mte_prop powerctl_prop qemu_hw_prop qemu_sf_lcd_density_prop radio_control_prop radio_prop serialno_prop surfaceflinger_color_prop system_prop system_user_mode_emulation_prop telephony_status_prop timezone_prop usb_control_prop vold_post_fs_data_prop wifi_hal_prop wifi_log_prop wifi_prop zram_control_prop default_prop rebootescrow_hal_prop virtual_face_hal_prop virtual_face_prop virtual_fingerprint_hal_prop virtual_fingerprint_prop persist_vendor_debug_wifi_prop vendor_default_prop adbd_prop adbd_tradeinmode_prop apexd_payload_metadata_prop ctl_snapuserd_prop ctl_prefetch_prop ctl_uprobestats_prop crashrecovery_prop debug_tracing_desktop_mode_visible_tasks_prop device_config_core_experiments_team_internal_prop device_config_lmkd_native_prop device_config_mglru_native_prop device_config_mmd_native_prop device_config_profcollect_native_boot_prop device_config_remote_key_provisioning_native_prop device_config_statsd_native_prop device_config_statsd_native_boot_prop device_config_storage_native_boot_prop device_config_sys_traced_prop device_config_window_manager_native_boot_prop device_config_configuration_prop device_config_connectivity_prop device_config_swcodec_native_prop device_config_tethering_u_or_later_native_prop dmesgd_start_prop fastbootd_protocol_prop gsid_prop init_perf_lsm_hooks_prop init_service_status_private_prop init_storage_prop init_svc_debug_prop kcmdline_prop keystore_diagnostics_prop keystore_listen_prop last_boot_reason_prop localization_prop logd_auditrate_prop lower_kptr_restrict_prop mmd_status_prop net_464xlat_fromvendor_prop net_connectivity_prop netd_stable_secret_prop next_boot_prop odsign_prop misctrl_prop perf_drop_caches_prop pm_prop prefetch_service_prop profcollectd_node_id_prop radio_cdma_ecm_prop remote_prov_prop remote_prov_cert_prop rollback_test_prop setupwizard_prop snapshotctl_prop snapuserd_prop system_adbd_prop system_audio_config_prop timezone_metadata_prop traced_config_prop traced_perf_enabled_prop traced_relay_relay_port_prop uprobestats_start_with_config_prop tuner_server_ctl_prop userspace_reboot_log_prop userspace_reboot_test_prop verity_status_prop zygote_wrap_prop ctl_mediatranscoding_prop ctl_odsign_prop virtualizationservice_prop ctl_apex_load_prop sensors_config_prop hypervisor_pvmfw_prop hypervisor_virtualizationmanager_prop game_manager_config_prop hidl_memory_prop suspend_debug_prop system_service_enable_prop ctl_artd_pre_reboot_prop trusty_security_vm_sys_prop hint_manager_config_prop bionic_linker_16kb_app_compat_prop device_config_virtualization_framework_native_prop fstype_prop log_file_logger_prop persist_sysui_builder_extras_prop persist_sysui_ranking_update_prop page_size_prop pm_16kb_app_compat_prop avf_virtualizationservice_prop high_barometer_quality_prop mmd_prop mmd_shared_prop prefetch_boot_prop ))
+(typeattributeset property_type (apexd_prop bootloader_boot_reason_prop device_config_activity_manager_native_boot_prop device_config_boot_count_prop device_config_input_native_boot_prop device_config_netd_native_prop device_config_reset_performed_prop firstboot_prop boottime_prop charger_prop cold_boot_done_prop ctl_adbd_prop ctl_apexd_prop ctl_bootanim_prop ctl_bugreport_prop ctl_console_prop ctl_dumpstate_prop ctl_fuse_prop ctl_gsid_prop ctl_interface_restart_prop ctl_interface_stop_prop ctl_mdnsd_prop ctl_restart_prop ctl_rildaemon_prop ctl_sigstop_prop dynamic_system_prop heapprofd_enabled_prop llkd_prop lpdumpd_prop mmc_prop mock_ota_prop net_dns_prop overlay_prop persistent_properties_ready_prop safemode_prop system_lmk_prop system_trace_prop test_boot_reason_prop time_prop traced_enabled_prop traced_lazy_prop aac_drc_prop adaptive_haptics_prop apex_ready_prop arm64_memtag_prop binder_cache_bluetooth_server_prop binder_cache_system_server_prop binder_cache_telephony_server_prop boot_status_prop bootanim_system_prop bootloader_prop boottime_public_prop bq_config_prop build_bootimage_prop build_prop composd_vm_art_prop device_config_aconfig_flags_prop device_config_camera_native_prop device_config_edgetpu_native_prop device_config_media_native_prop device_config_nnapi_native_prop device_config_runtime_native_boot_prop device_config_runtime_native_prop device_config_surface_flinger_native_boot_prop device_config_vendor_system_native_prop device_config_vendor_system_native_boot_prop drm_forcel3_prop fingerprint_prop gwp_asan_prop hal_instrumentation_prop userdebug_or_eng_prop init_service_status_prop libc_debug_prop module_sdkextensions_prop nnapi_ext_deny_product_prop persist_wm_debug_prop power_debug_prop property_service_version_prop provisioned_prop restorecon_prop retaildemo_prop servicemanager_prop smart_idle_maint_enabled_prop socket_hook_prop sqlite_log_prop surfaceflinger_display_prop system_boot_reason_prop system_jvmti_agent_prop traced_oome_heap_session_count_prop ab_update_gki_prop usb_prop userspace_reboot_exported_prop vold_status_prop vts_status_prop enable_16k_pages_prop profcollectd_etr_prop config_prop cppreopt_prop dalvik_prop debuggerd_prop device_logging_prop dhcp_prop dumpstate_prop exported3_system_prop exported_dumpstate_prop exported_secure_prop heapprofd_prop net_radio_prop pan_result_prop persist_debug_prop shell_prop test_harness_prop theme_prop use_memfd_prop vold_prop apexd_config_prop apexd_select_prop aaudio_config_prop apk_verity_prop audio_config_prop bootanim_config_prop bluetooth_config_prop build_attestation_prop build_config_prop build_odm_prop build_vendor_prop camera_calibration_prop camera_config_prop camera2_extensions_prop camerax_extensions_prop charger_config_prop codec2_config_prop composd_vm_vendor_prop cpu_variant_prop debugfs_restriction_prop drm_config_prop drm_service_config_prop exported_camera_prop exported_config_prop exported_default_prop ffs_config_prop framework_watchdog_config_prop graphics_config_prop hdmi_config_prop hw_timeout_multiplier_prop hypervisor_prop hypervisor_restricted_prop incremental_prop input_device_config_prop keyguard_config_prop keystore_config_prop lmkd_config_prop media_config_prop media_variant_prop mediadrm_config_prop mm_events_config_prop oem_unlock_prop ota_build_prop packagemanager_config_prop quick_start_prop recovery_config_prop recovery_usb_config_prop sendbug_config_prop soc_prop storage_config_prop storagemanager_config_prop surfaceflinger_prop suspend_prop systemsound_config_prop telephony_config_prop threadnetwork_config_prop tombstone_config_prop usb_config_prop userspace_reboot_config_prop vehicle_hal_prop vendor_security_patch_level_prop vendor_socket_hook_prop virtual_ab_prop vndk_prop vts_config_prop vold_config_prop wifi_config_prop zram_config_prop zygote_config_prop dck_prop tuner_config_prop usb_uvc_enabled_prop setupwizard_mode_prop pm_archiving_enabled_prop trusty_security_vm_sys_vendor_prop adbd_config_prop audio_prop bluetooth_a2dp_offload_prop bluetooth_audio_hal_prop bluetooth_finder_prop bluetooth_prop bpf_progs_loaded_prop charger_status_prop ctl_default_prop ctl_interface_start_prop ctl_start_prop ctl_stop_prop dalvik_config_prop dalvik_dynamic_config_prop dalvik_runtime_prop debug_prop device_config_memory_safety_native_boot_prop device_config_memory_safety_native_prop dumpstate_options_prop exported_system_prop exported_bluetooth_prop exported_overlay_prop exported_pm_prop future_pm_prop ffs_control_prop framework_status_prop gesture_prop graphics_config_writable_prop hal_dumpstate_config_prop sota_prop hwservicemanager_prop lmkd_prop locale_prop logd_prop logpersistd_logging_prop log_prop log_tag_prop lowpan_prop nfc_prop ota_prop permissive_mte_prop powerctl_prop qemu_hw_prop qemu_sf_lcd_density_prop radio_control_prop radio_prop serialno_prop surfaceflinger_color_prop system_prop system_user_mode_emulation_prop telephony_status_prop timezone_prop usb_control_prop vold_post_fs_data_prop wifi_hal_prop wifi_log_prop wifi_prop zram_control_prop default_prop rebootescrow_hal_prop virtual_face_hal_prop virtual_face_prop virtual_fingerprint_hal_prop virtual_fingerprint_prop persist_vendor_debug_wifi_prop vendor_default_prop adbd_prop adbd_tradeinmode_prop apexd_payload_metadata_prop ctl_snapuserd_prop ctl_prefetch_prop ctl_uprobestats_prop crashrecovery_prop debug_tracing_desktop_mode_visible_tasks_prop device_config_core_experiments_team_internal_prop device_config_lmkd_native_prop device_config_mglru_native_prop device_config_mmd_native_prop device_config_profcollect_native_boot_prop device_config_remote_key_provisioning_native_prop device_config_statsd_native_prop device_config_statsd_native_boot_prop device_config_storage_native_boot_prop device_config_sys_traced_prop device_config_window_manager_native_boot_prop device_config_configuration_prop device_config_connectivity_prop device_config_swcodec_native_prop device_config_tethering_u_or_later_native_prop dmesgd_start_prop fastbootd_protocol_prop gsid_prop init_perf_lsm_hooks_prop init_service_status_private_prop init_storage_prop init_svc_debug_prop kcmdline_prop keystore_diagnostics_prop keystore_listen_prop last_boot_reason_prop localization_prop logd_auditrate_prop lower_kptr_restrict_prop mmd_status_prop net_464xlat_fromvendor_prop net_connectivity_prop netd_stable_secret_prop next_boot_prop odsign_prop misctrl_prop perf_drop_caches_prop pm_prop prefetch_service_prop profcollectd_node_id_prop radio_cdma_ecm_prop remote_prov_prop remote_prov_cert_prop rollback_test_prop setupwizard_prop snapshotctl_prop snapuserd_prop system_adbd_prop system_audio_config_prop timezone_metadata_prop traced_config_prop traced_perf_enabled_prop traced_relay_relay_port_prop uprobestats_start_with_config_prop tuner_server_ctl_prop userspace_reboot_log_prop userspace_reboot_test_prop verity_status_prop zygote_wrap_prop ctl_mediatranscoding_prop ctl_odsign_prop virtualizationservice_prop ctl_apex_load_prop sensors_config_prop hypervisor_pvmfw_prop hypervisor_virtualizationmanager_prop game_manager_config_prop hidl_memory_prop suspend_debug_prop system_service_enable_prop ctl_artd_pre_reboot_prop trusty_security_vm_sys_prop hint_manager_config_prop bionic_linker_16kb_app_compat_prop device_config_virtualization_framework_native_prop fstype_prop log_file_logger_prop mmd_shared_status_prop persist_sysui_builder_extras_prop persist_sysui_ranking_update_prop page_size_prop pm_16kb_app_compat_prop avf_virtualizationservice_prop high_barometer_quality_prop mmd_prop mmd_shared_prop prefetch_boot_prop ))
 (typeattribute core_property_type)
 (typeattributeset core_property_type (restorecon_prop usb_prop config_prop cppreopt_prop dalvik_prop debuggerd_prop dhcp_prop dumpstate_prop net_radio_prop pan_result_prop persist_debug_prop shell_prop vold_prop audio_prop debug_prop logd_prop nfc_prop ota_prop powerctl_prop radio_prop system_prop ))
 (typeattribute log_property_type)
@@ -751,13 +751,13 @@
 (typeattribute extended_core_property_type)
 (typeattribute system_property_type)
 (expandtypeattribute (system_property_type) false)
-(typeattributeset system_property_type (apexd_prop bootloader_boot_reason_prop device_config_activity_manager_native_boot_prop device_config_boot_count_prop device_config_input_native_boot_prop device_config_netd_native_prop device_config_reset_performed_prop firstboot_prop boottime_prop charger_prop cold_boot_done_prop ctl_adbd_prop ctl_apexd_prop ctl_bootanim_prop ctl_bugreport_prop ctl_console_prop ctl_dumpstate_prop ctl_fuse_prop ctl_gsid_prop ctl_interface_restart_prop ctl_interface_stop_prop ctl_mdnsd_prop ctl_restart_prop ctl_rildaemon_prop ctl_sigstop_prop dynamic_system_prop heapprofd_enabled_prop llkd_prop lpdumpd_prop mmc_prop mock_ota_prop net_dns_prop overlay_prop persistent_properties_ready_prop safemode_prop system_lmk_prop system_trace_prop test_boot_reason_prop time_prop traced_enabled_prop traced_lazy_prop aac_drc_prop adaptive_haptics_prop apex_ready_prop arm64_memtag_prop binder_cache_bluetooth_server_prop binder_cache_system_server_prop binder_cache_telephony_server_prop boot_status_prop bootanim_system_prop bootloader_prop boottime_public_prop bq_config_prop build_bootimage_prop build_prop composd_vm_art_prop device_config_aconfig_flags_prop device_config_camera_native_prop device_config_edgetpu_native_prop device_config_media_native_prop device_config_nnapi_native_prop device_config_runtime_native_boot_prop device_config_runtime_native_prop device_config_surface_flinger_native_boot_prop device_config_vendor_system_native_prop device_config_vendor_system_native_boot_prop drm_forcel3_prop fingerprint_prop gwp_asan_prop hal_instrumentation_prop userdebug_or_eng_prop init_service_status_prop libc_debug_prop module_sdkextensions_prop nnapi_ext_deny_product_prop persist_wm_debug_prop power_debug_prop property_service_version_prop provisioned_prop restorecon_prop retaildemo_prop servicemanager_prop smart_idle_maint_enabled_prop socket_hook_prop sqlite_log_prop surfaceflinger_display_prop system_boot_reason_prop system_jvmti_agent_prop traced_oome_heap_session_count_prop ab_update_gki_prop usb_prop userspace_reboot_exported_prop vold_status_prop vts_status_prop enable_16k_pages_prop profcollectd_etr_prop config_prop cppreopt_prop dalvik_prop debuggerd_prop device_logging_prop dhcp_prop dumpstate_prop exported3_system_prop exported_dumpstate_prop exported_secure_prop heapprofd_prop net_radio_prop pan_result_prop persist_debug_prop shell_prop test_harness_prop theme_prop use_memfd_prop vold_prop apexd_config_prop apexd_select_prop aaudio_config_prop apk_verity_prop audio_config_prop bootanim_config_prop bluetooth_config_prop build_attestation_prop build_config_prop build_odm_prop build_vendor_prop camera_calibration_prop camera_config_prop camera2_extensions_prop camerax_extensions_prop charger_config_prop codec2_config_prop composd_vm_vendor_prop cpu_variant_prop debugfs_restriction_prop drm_config_prop drm_service_config_prop exported_camera_prop exported_config_prop exported_default_prop ffs_config_prop framework_watchdog_config_prop graphics_config_prop hdmi_config_prop hw_timeout_multiplier_prop hypervisor_prop hypervisor_restricted_prop incremental_prop input_device_config_prop keyguard_config_prop keystore_config_prop lmkd_config_prop media_config_prop media_variant_prop mediadrm_config_prop mm_events_config_prop oem_unlock_prop ota_build_prop packagemanager_config_prop quick_start_prop recovery_config_prop recovery_usb_config_prop sendbug_config_prop soc_prop storage_config_prop storagemanager_config_prop surfaceflinger_prop suspend_prop systemsound_config_prop telephony_config_prop threadnetwork_config_prop tombstone_config_prop usb_config_prop userspace_reboot_config_prop vehicle_hal_prop vendor_security_patch_level_prop vendor_socket_hook_prop virtual_ab_prop vndk_prop vts_config_prop vold_config_prop wifi_config_prop zram_config_prop zygote_config_prop dck_prop tuner_config_prop usb_uvc_enabled_prop setupwizard_mode_prop pm_archiving_enabled_prop trusty_security_vm_sys_vendor_prop adbd_config_prop audio_prop bluetooth_a2dp_offload_prop bluetooth_audio_hal_prop bluetooth_finder_prop bluetooth_prop bpf_progs_loaded_prop charger_status_prop ctl_default_prop ctl_interface_start_prop ctl_start_prop ctl_stop_prop dalvik_config_prop dalvik_dynamic_config_prop dalvik_runtime_prop debug_prop device_config_memory_safety_native_boot_prop device_config_memory_safety_native_prop dumpstate_options_prop exported_system_prop exported_bluetooth_prop exported_overlay_prop exported_pm_prop future_pm_prop ffs_control_prop framework_status_prop gesture_prop graphics_config_writable_prop hal_dumpstate_config_prop sota_prop hwservicemanager_prop lmkd_prop locale_prop logd_prop logpersistd_logging_prop log_prop log_tag_prop lowpan_prop nfc_prop ota_prop permissive_mte_prop powerctl_prop qemu_hw_prop qemu_sf_lcd_density_prop radio_control_prop radio_prop serialno_prop surfaceflinger_color_prop system_prop system_user_mode_emulation_prop telephony_status_prop timezone_prop usb_control_prop vold_post_fs_data_prop wifi_hal_prop wifi_log_prop wifi_prop zram_control_prop default_prop virtual_face_prop virtual_fingerprint_prop adbd_prop adbd_tradeinmode_prop apexd_payload_metadata_prop ctl_snapuserd_prop ctl_prefetch_prop ctl_uprobestats_prop crashrecovery_prop debug_tracing_desktop_mode_visible_tasks_prop device_config_core_experiments_team_internal_prop device_config_lmkd_native_prop device_config_mglru_native_prop device_config_mmd_native_prop device_config_profcollect_native_boot_prop device_config_remote_key_provisioning_native_prop device_config_statsd_native_prop device_config_statsd_native_boot_prop device_config_storage_native_boot_prop device_config_sys_traced_prop device_config_window_manager_native_boot_prop device_config_configuration_prop device_config_connectivity_prop device_config_swcodec_native_prop device_config_tethering_u_or_later_native_prop dmesgd_start_prop fastbootd_protocol_prop gsid_prop init_perf_lsm_hooks_prop init_service_status_private_prop init_storage_prop init_svc_debug_prop kcmdline_prop keystore_diagnostics_prop keystore_listen_prop last_boot_reason_prop localization_prop logd_auditrate_prop lower_kptr_restrict_prop mmd_status_prop net_464xlat_fromvendor_prop net_connectivity_prop netd_stable_secret_prop next_boot_prop odsign_prop misctrl_prop perf_drop_caches_prop pm_prop prefetch_service_prop profcollectd_node_id_prop radio_cdma_ecm_prop remote_prov_prop remote_prov_cert_prop rollback_test_prop setupwizard_prop snapshotctl_prop snapuserd_prop system_adbd_prop system_audio_config_prop timezone_metadata_prop traced_config_prop traced_perf_enabled_prop traced_relay_relay_port_prop uprobestats_start_with_config_prop tuner_server_ctl_prop userspace_reboot_log_prop userspace_reboot_test_prop verity_status_prop zygote_wrap_prop ctl_mediatranscoding_prop ctl_odsign_prop virtualizationservice_prop ctl_apex_load_prop sensors_config_prop hypervisor_pvmfw_prop hypervisor_virtualizationmanager_prop game_manager_config_prop hidl_memory_prop suspend_debug_prop system_service_enable_prop ctl_artd_pre_reboot_prop trusty_security_vm_sys_prop hint_manager_config_prop bionic_linker_16kb_app_compat_prop device_config_virtualization_framework_native_prop fstype_prop log_file_logger_prop persist_sysui_builder_extras_prop persist_sysui_ranking_update_prop page_size_prop pm_16kb_app_compat_prop avf_virtualizationservice_prop high_barometer_quality_prop mmd_prop mmd_shared_prop prefetch_boot_prop ))
+(typeattributeset system_property_type (apexd_prop bootloader_boot_reason_prop device_config_activity_manager_native_boot_prop device_config_boot_count_prop device_config_input_native_boot_prop device_config_netd_native_prop device_config_reset_performed_prop firstboot_prop boottime_prop charger_prop cold_boot_done_prop ctl_adbd_prop ctl_apexd_prop ctl_bootanim_prop ctl_bugreport_prop ctl_console_prop ctl_dumpstate_prop ctl_fuse_prop ctl_gsid_prop ctl_interface_restart_prop ctl_interface_stop_prop ctl_mdnsd_prop ctl_restart_prop ctl_rildaemon_prop ctl_sigstop_prop dynamic_system_prop heapprofd_enabled_prop llkd_prop lpdumpd_prop mmc_prop mock_ota_prop net_dns_prop overlay_prop persistent_properties_ready_prop safemode_prop system_lmk_prop system_trace_prop test_boot_reason_prop time_prop traced_enabled_prop traced_lazy_prop aac_drc_prop adaptive_haptics_prop apex_ready_prop arm64_memtag_prop binder_cache_bluetooth_server_prop binder_cache_system_server_prop binder_cache_telephony_server_prop boot_status_prop bootanim_system_prop bootloader_prop boottime_public_prop bq_config_prop build_bootimage_prop build_prop composd_vm_art_prop device_config_aconfig_flags_prop device_config_camera_native_prop device_config_edgetpu_native_prop device_config_media_native_prop device_config_nnapi_native_prop device_config_runtime_native_boot_prop device_config_runtime_native_prop device_config_surface_flinger_native_boot_prop device_config_vendor_system_native_prop device_config_vendor_system_native_boot_prop drm_forcel3_prop fingerprint_prop gwp_asan_prop hal_instrumentation_prop userdebug_or_eng_prop init_service_status_prop libc_debug_prop module_sdkextensions_prop nnapi_ext_deny_product_prop persist_wm_debug_prop power_debug_prop property_service_version_prop provisioned_prop restorecon_prop retaildemo_prop servicemanager_prop smart_idle_maint_enabled_prop socket_hook_prop sqlite_log_prop surfaceflinger_display_prop system_boot_reason_prop system_jvmti_agent_prop traced_oome_heap_session_count_prop ab_update_gki_prop usb_prop userspace_reboot_exported_prop vold_status_prop vts_status_prop enable_16k_pages_prop profcollectd_etr_prop config_prop cppreopt_prop dalvik_prop debuggerd_prop device_logging_prop dhcp_prop dumpstate_prop exported3_system_prop exported_dumpstate_prop exported_secure_prop heapprofd_prop net_radio_prop pan_result_prop persist_debug_prop shell_prop test_harness_prop theme_prop use_memfd_prop vold_prop apexd_config_prop apexd_select_prop aaudio_config_prop apk_verity_prop audio_config_prop bootanim_config_prop bluetooth_config_prop build_attestation_prop build_config_prop build_odm_prop build_vendor_prop camera_calibration_prop camera_config_prop camera2_extensions_prop camerax_extensions_prop charger_config_prop codec2_config_prop composd_vm_vendor_prop cpu_variant_prop debugfs_restriction_prop drm_config_prop drm_service_config_prop exported_camera_prop exported_config_prop exported_default_prop ffs_config_prop framework_watchdog_config_prop graphics_config_prop hdmi_config_prop hw_timeout_multiplier_prop hypervisor_prop hypervisor_restricted_prop incremental_prop input_device_config_prop keyguard_config_prop keystore_config_prop lmkd_config_prop media_config_prop media_variant_prop mediadrm_config_prop mm_events_config_prop oem_unlock_prop ota_build_prop packagemanager_config_prop quick_start_prop recovery_config_prop recovery_usb_config_prop sendbug_config_prop soc_prop storage_config_prop storagemanager_config_prop surfaceflinger_prop suspend_prop systemsound_config_prop telephony_config_prop threadnetwork_config_prop tombstone_config_prop usb_config_prop userspace_reboot_config_prop vehicle_hal_prop vendor_security_patch_level_prop vendor_socket_hook_prop virtual_ab_prop vndk_prop vts_config_prop vold_config_prop wifi_config_prop zram_config_prop zygote_config_prop dck_prop tuner_config_prop usb_uvc_enabled_prop setupwizard_mode_prop pm_archiving_enabled_prop trusty_security_vm_sys_vendor_prop adbd_config_prop audio_prop bluetooth_a2dp_offload_prop bluetooth_audio_hal_prop bluetooth_finder_prop bluetooth_prop bpf_progs_loaded_prop charger_status_prop ctl_default_prop ctl_interface_start_prop ctl_start_prop ctl_stop_prop dalvik_config_prop dalvik_dynamic_config_prop dalvik_runtime_prop debug_prop device_config_memory_safety_native_boot_prop device_config_memory_safety_native_prop dumpstate_options_prop exported_system_prop exported_bluetooth_prop exported_overlay_prop exported_pm_prop future_pm_prop ffs_control_prop framework_status_prop gesture_prop graphics_config_writable_prop hal_dumpstate_config_prop sota_prop hwservicemanager_prop lmkd_prop locale_prop logd_prop logpersistd_logging_prop log_prop log_tag_prop lowpan_prop nfc_prop ota_prop permissive_mte_prop powerctl_prop qemu_hw_prop qemu_sf_lcd_density_prop radio_control_prop radio_prop serialno_prop surfaceflinger_color_prop system_prop system_user_mode_emulation_prop telephony_status_prop timezone_prop usb_control_prop vold_post_fs_data_prop wifi_hal_prop wifi_log_prop wifi_prop zram_control_prop default_prop virtual_face_prop virtual_fingerprint_prop adbd_prop adbd_tradeinmode_prop apexd_payload_metadata_prop ctl_snapuserd_prop ctl_prefetch_prop ctl_uprobestats_prop crashrecovery_prop debug_tracing_desktop_mode_visible_tasks_prop device_config_core_experiments_team_internal_prop device_config_lmkd_native_prop device_config_mglru_native_prop device_config_mmd_native_prop device_config_profcollect_native_boot_prop device_config_remote_key_provisioning_native_prop device_config_statsd_native_prop device_config_statsd_native_boot_prop device_config_storage_native_boot_prop device_config_sys_traced_prop device_config_window_manager_native_boot_prop device_config_configuration_prop device_config_connectivity_prop device_config_swcodec_native_prop device_config_tethering_u_or_later_native_prop dmesgd_start_prop fastbootd_protocol_prop gsid_prop init_perf_lsm_hooks_prop init_service_status_private_prop init_storage_prop init_svc_debug_prop kcmdline_prop keystore_diagnostics_prop keystore_listen_prop last_boot_reason_prop localization_prop logd_auditrate_prop lower_kptr_restrict_prop mmd_status_prop net_464xlat_fromvendor_prop net_connectivity_prop netd_stable_secret_prop next_boot_prop odsign_prop misctrl_prop perf_drop_caches_prop pm_prop prefetch_service_prop profcollectd_node_id_prop radio_cdma_ecm_prop remote_prov_prop remote_prov_cert_prop rollback_test_prop setupwizard_prop snapshotctl_prop snapuserd_prop system_adbd_prop system_audio_config_prop timezone_metadata_prop traced_config_prop traced_perf_enabled_prop traced_relay_relay_port_prop uprobestats_start_with_config_prop tuner_server_ctl_prop userspace_reboot_log_prop userspace_reboot_test_prop verity_status_prop zygote_wrap_prop ctl_mediatranscoding_prop ctl_odsign_prop virtualizationservice_prop ctl_apex_load_prop sensors_config_prop hypervisor_pvmfw_prop hypervisor_virtualizationmanager_prop game_manager_config_prop hidl_memory_prop suspend_debug_prop system_service_enable_prop ctl_artd_pre_reboot_prop trusty_security_vm_sys_prop hint_manager_config_prop bionic_linker_16kb_app_compat_prop device_config_virtualization_framework_native_prop fstype_prop log_file_logger_prop mmd_shared_status_prop persist_sysui_builder_extras_prop persist_sysui_ranking_update_prop page_size_prop pm_16kb_app_compat_prop avf_virtualizationservice_prop high_barometer_quality_prop mmd_prop mmd_shared_prop prefetch_boot_prop ))
 (typeattribute system_internal_property_type)
 (expandtypeattribute (system_internal_property_type) false)
 (typeattributeset system_internal_property_type (apexd_prop bootloader_boot_reason_prop device_config_activity_manager_native_boot_prop device_config_boot_count_prop device_config_input_native_boot_prop device_config_netd_native_prop device_config_reset_performed_prop firstboot_prop boottime_prop charger_prop cold_boot_done_prop ctl_adbd_prop ctl_apexd_prop ctl_bootanim_prop ctl_bugreport_prop ctl_console_prop ctl_dumpstate_prop ctl_fuse_prop ctl_gsid_prop ctl_interface_restart_prop ctl_interface_stop_prop ctl_mdnsd_prop ctl_restart_prop ctl_rildaemon_prop ctl_sigstop_prop dynamic_system_prop heapprofd_enabled_prop llkd_prop lpdumpd_prop mmc_prop mock_ota_prop net_dns_prop overlay_prop persistent_properties_ready_prop safemode_prop system_lmk_prop system_trace_prop test_boot_reason_prop time_prop traced_enabled_prop traced_lazy_prop default_prop adbd_prop adbd_tradeinmode_prop apexd_payload_metadata_prop ctl_snapuserd_prop ctl_prefetch_prop ctl_uprobestats_prop crashrecovery_prop debug_tracing_desktop_mode_visible_tasks_prop device_config_core_experiments_team_internal_prop device_config_lmkd_native_prop device_config_mglru_native_prop device_config_mmd_native_prop device_config_profcollect_native_boot_prop device_config_remote_key_provisioning_native_prop device_config_statsd_native_prop device_config_statsd_native_boot_prop device_config_storage_native_boot_prop device_config_sys_traced_prop device_config_window_manager_native_boot_prop device_config_configuration_prop device_config_connectivity_prop device_config_swcodec_native_prop device_config_tethering_u_or_later_native_prop dmesgd_start_prop fastbootd_protocol_prop gsid_prop init_perf_lsm_hooks_prop init_service_status_private_prop init_storage_prop init_svc_debug_prop kcmdline_prop keystore_diagnostics_prop keystore_listen_prop last_boot_reason_prop localization_prop logd_auditrate_prop lower_kptr_restrict_prop mmd_status_prop net_464xlat_fromvendor_prop net_connectivity_prop netd_stable_secret_prop next_boot_prop odsign_prop misctrl_prop perf_drop_caches_prop pm_prop prefetch_service_prop profcollectd_node_id_prop radio_cdma_ecm_prop remote_prov_prop remote_prov_cert_prop rollback_test_prop setupwizard_prop snapshotctl_prop snapuserd_prop system_adbd_prop system_audio_config_prop timezone_metadata_prop traced_config_prop traced_perf_enabled_prop traced_relay_relay_port_prop uprobestats_start_with_config_prop tuner_server_ctl_prop userspace_reboot_log_prop userspace_reboot_test_prop verity_status_prop zygote_wrap_prop ctl_mediatranscoding_prop ctl_odsign_prop virtualizationservice_prop ctl_apex_load_prop sensors_config_prop hypervisor_pvmfw_prop hypervisor_virtualizationmanager_prop game_manager_config_prop hidl_memory_prop suspend_debug_prop system_service_enable_prop ctl_artd_pre_reboot_prop trusty_security_vm_sys_prop hint_manager_config_prop ))
 (typeattribute system_restricted_property_type)
 (expandtypeattribute (system_restricted_property_type) false)
-(typeattributeset system_restricted_property_type (aac_drc_prop adaptive_haptics_prop apex_ready_prop arm64_memtag_prop binder_cache_bluetooth_server_prop binder_cache_system_server_prop binder_cache_telephony_server_prop boot_status_prop bootanim_system_prop bootloader_prop boottime_public_prop bq_config_prop build_bootimage_prop build_prop composd_vm_art_prop device_config_aconfig_flags_prop device_config_camera_native_prop device_config_edgetpu_native_prop device_config_media_native_prop device_config_nnapi_native_prop device_config_runtime_native_boot_prop device_config_runtime_native_prop device_config_surface_flinger_native_boot_prop device_config_vendor_system_native_prop device_config_vendor_system_native_boot_prop drm_forcel3_prop fingerprint_prop gwp_asan_prop hal_instrumentation_prop userdebug_or_eng_prop init_service_status_prop libc_debug_prop module_sdkextensions_prop nnapi_ext_deny_product_prop persist_wm_debug_prop power_debug_prop property_service_version_prop provisioned_prop restorecon_prop retaildemo_prop servicemanager_prop smart_idle_maint_enabled_prop socket_hook_prop sqlite_log_prop surfaceflinger_display_prop system_boot_reason_prop system_jvmti_agent_prop traced_oome_heap_session_count_prop ab_update_gki_prop usb_prop userspace_reboot_exported_prop vold_status_prop vts_status_prop enable_16k_pages_prop profcollectd_etr_prop config_prop cppreopt_prop dalvik_prop debuggerd_prop device_logging_prop dhcp_prop dumpstate_prop exported3_system_prop exported_dumpstate_prop exported_secure_prop heapprofd_prop net_radio_prop pan_result_prop persist_debug_prop shell_prop test_harness_prop theme_prop use_memfd_prop vold_prop bionic_linker_16kb_app_compat_prop device_config_virtualization_framework_native_prop fstype_prop log_file_logger_prop persist_sysui_builder_extras_prop persist_sysui_ranking_update_prop page_size_prop pm_16kb_app_compat_prop ))
+(typeattributeset system_restricted_property_type (aac_drc_prop adaptive_haptics_prop apex_ready_prop arm64_memtag_prop binder_cache_bluetooth_server_prop binder_cache_system_server_prop binder_cache_telephony_server_prop boot_status_prop bootanim_system_prop bootloader_prop boottime_public_prop bq_config_prop build_bootimage_prop build_prop composd_vm_art_prop device_config_aconfig_flags_prop device_config_camera_native_prop device_config_edgetpu_native_prop device_config_media_native_prop device_config_nnapi_native_prop device_config_runtime_native_boot_prop device_config_runtime_native_prop device_config_surface_flinger_native_boot_prop device_config_vendor_system_native_prop device_config_vendor_system_native_boot_prop drm_forcel3_prop fingerprint_prop gwp_asan_prop hal_instrumentation_prop userdebug_or_eng_prop init_service_status_prop libc_debug_prop module_sdkextensions_prop nnapi_ext_deny_product_prop persist_wm_debug_prop power_debug_prop property_service_version_prop provisioned_prop restorecon_prop retaildemo_prop servicemanager_prop smart_idle_maint_enabled_prop socket_hook_prop sqlite_log_prop surfaceflinger_display_prop system_boot_reason_prop system_jvmti_agent_prop traced_oome_heap_session_count_prop ab_update_gki_prop usb_prop userspace_reboot_exported_prop vold_status_prop vts_status_prop enable_16k_pages_prop profcollectd_etr_prop config_prop cppreopt_prop dalvik_prop debuggerd_prop device_logging_prop dhcp_prop dumpstate_prop exported3_system_prop exported_dumpstate_prop exported_secure_prop heapprofd_prop net_radio_prop pan_result_prop persist_debug_prop shell_prop test_harness_prop theme_prop use_memfd_prop vold_prop bionic_linker_16kb_app_compat_prop device_config_virtualization_framework_native_prop fstype_prop log_file_logger_prop mmd_shared_status_prop persist_sysui_builder_extras_prop persist_sysui_ranking_update_prop page_size_prop pm_16kb_app_compat_prop ))
 (typeattribute system_public_property_type)
 (expandtypeattribute (system_public_property_type) false)
 (typeattributeset system_public_property_type (apexd_config_prop apexd_select_prop aaudio_config_prop apk_verity_prop audio_config_prop bootanim_config_prop bluetooth_config_prop build_attestation_prop build_config_prop build_odm_prop build_vendor_prop camera_calibration_prop camera_config_prop camera2_extensions_prop camerax_extensions_prop charger_config_prop codec2_config_prop composd_vm_vendor_prop cpu_variant_prop debugfs_restriction_prop drm_config_prop drm_service_config_prop exported_camera_prop exported_config_prop exported_default_prop ffs_config_prop framework_watchdog_config_prop graphics_config_prop hdmi_config_prop hw_timeout_multiplier_prop hypervisor_prop hypervisor_restricted_prop incremental_prop input_device_config_prop keyguard_config_prop keystore_config_prop lmkd_config_prop media_config_prop media_variant_prop mediadrm_config_prop mm_events_config_prop oem_unlock_prop ota_build_prop packagemanager_config_prop quick_start_prop recovery_config_prop recovery_usb_config_prop sendbug_config_prop soc_prop storage_config_prop storagemanager_config_prop surfaceflinger_prop suspend_prop systemsound_config_prop telephony_config_prop threadnetwork_config_prop tombstone_config_prop usb_config_prop userspace_reboot_config_prop vehicle_hal_prop vendor_security_patch_level_prop vendor_socket_hook_prop virtual_ab_prop vndk_prop vts_config_prop vold_config_prop wifi_config_prop zram_config_prop zygote_config_prop dck_prop tuner_config_prop usb_uvc_enabled_prop setupwizard_mode_prop pm_archiving_enabled_prop trusty_security_vm_sys_vendor_prop adbd_config_prop audio_prop bluetooth_a2dp_offload_prop bluetooth_audio_hal_prop bluetooth_finder_prop bluetooth_prop bpf_progs_loaded_prop charger_status_prop ctl_default_prop ctl_interface_start_prop ctl_start_prop ctl_stop_prop dalvik_config_prop dalvik_dynamic_config_prop dalvik_runtime_prop debug_prop device_config_memory_safety_native_boot_prop device_config_memory_safety_native_prop dumpstate_options_prop exported_system_prop exported_bluetooth_prop exported_overlay_prop exported_pm_prop future_pm_prop ffs_control_prop framework_status_prop gesture_prop graphics_config_writable_prop hal_dumpstate_config_prop sota_prop hwservicemanager_prop lmkd_prop locale_prop logd_prop logpersistd_logging_prop log_prop log_tag_prop lowpan_prop nfc_prop ota_prop permissive_mte_prop powerctl_prop qemu_hw_prop qemu_sf_lcd_density_prop radio_control_prop radio_prop serialno_prop surfaceflinger_color_prop system_prop system_user_mode_emulation_prop telephony_status_prop timezone_prop usb_control_prop vold_post_fs_data_prop wifi_hal_prop wifi_log_prop wifi_prop zram_control_prop virtual_face_prop virtual_fingerprint_prop avf_virtualizationservice_prop high_barometer_quality_prop mmd_prop mmd_shared_prop prefetch_boot_prop ))
@@ -783,9 +783,9 @@
 (typeattribute system_api_service)
 (typeattributeset system_api_service (device_config_updatable_service ondevicepersonalization_system_service adb_service adservices_manager_service app_hibernation_service app_integrity_service cacheinfo_service cpuinfo_service credential_service dbinfo_service device_state_service diskstats_service color_display_service gfxinfo_service intrusion_detection_service lock_settings_service meminfo_service network_score_service oem_lock_service overlay_service persistent_data_block_service resources_manager_service serial_service system_config_service system_server_dumper_service updatelock_service window_service inputflinger_service authentication_policy_service bg_install_control_service dynamic_system_service incidentcompanion_service protolog_configuration_service safety_center_service statsmanager_service ))
 (typeattribute protected_service)
-(typeattributeset protected_service (hal_audio_service hal_authgraph_service hal_authsecret_service hal_bluetooth_service hal_bootctl_service hal_broadcastradio_service hal_camera_service hal_can_controller_service hal_confirmationui_service hal_contexthub_service hal_dumpstate_service hal_evs_service hal_face_service hal_fastboot_service hal_fingerprint_service hal_gnss_service hal_graphics_composer_service hal_health_service hal_health_storage_service hal_identity_service hal_input_processor_service hal_ir_service hal_ivn_service hal_keymint_service hal_light_service hal_macsec_service hal_mediaquality_service hal_memtrack_service hal_nfc_service hal_oemlock_service hal_power_service hal_power_stats_service hal_radio_service hal_rebootescrow_service hal_remoteaccess_service hal_remotelyprovisionedcomponent_avf_service hal_remotelyprovisionedcomponent_service hal_sensors_service hal_secretkeeper_service hal_secureclock_service hal_secure_element_service hal_sharedsecret_service hal_system_suspend_service hal_tetheroffload_service hal_thermal_service hal_tv_hdmi_cec_service hal_tv_hdmi_connection_service hal_tv_hdmi_earc_service hal_tv_input_service hal_threadnetwork_service hal_tv_tuner_service hal_usb_service hal_usb_gadget_service hal_uwb_service hal_vehicle_service hal_vibrator_service hal_weaver_service hal_nlinterceptor_service hal_wifi_service hal_wifi_hostapd_service hal_wifi_supplicant_service hal_gatekeeper_service hal_vm_capabilities_service ))
+(typeattributeset protected_service (hal_audio_service hal_authgraph_service hal_authsecret_service hal_bluetooth_service hal_bootctl_service hal_broadcastradio_service hal_camera_service hal_can_controller_service hal_confirmationui_service hal_contexthub_service hal_dumpstate_service hal_evs_service hal_face_service hal_fastboot_service hal_fingerprint_service hal_gnss_service hal_graphics_composer_service hal_health_service hal_health_storage_service hal_hwcrypto_service hal_identity_service hal_input_processor_service hal_ir_service hal_ivn_service hal_keymint_service hal_light_service hal_macsec_service hal_mediaquality_service hal_memtrack_service hal_nfc_service hal_oemlock_service hal_power_service hal_power_stats_service hal_radio_service hal_rebootescrow_service hal_remoteaccess_service hal_remotelyprovisionedcomponent_avf_service hal_remotelyprovisionedcomponent_service hal_sensors_service hal_secretkeeper_service hal_secureclock_service hal_secure_element_service hal_sharedsecret_service hal_system_suspend_service hal_tetheroffload_service hal_thermal_service hal_tv_hdmi_cec_service hal_tv_hdmi_connection_service hal_tv_hdmi_earc_service hal_tv_input_service hal_threadnetwork_service hal_tv_tuner_service hal_usb_service hal_usb_gadget_service hal_uwb_service hal_vehicle_service hal_vibrator_service hal_weaver_service hal_nlinterceptor_service hal_wifi_service hal_wifi_hostapd_service hal_wifi_supplicant_service hal_gatekeeper_service hal_vm_capabilities_service ))
 (typeattribute service_manager_type)
-(typeattributeset service_manager_type (aidl_lazy_test_service apc_service apex_service artd_service artd_pre_reboot_service audioserver_service authorization_service batteryproperties_service bluetooth_service cameraserver_service fwk_camera_service default_android_service device_config_updatable_service dexopt_chroot_setup_service dnsresolver_service drmserver_service dumpstate_service evsmanagerd_service fingerprintd_service fwk_automotive_display_service fwk_vold_service gatekeeper_service gpu_service idmap_service incident_service installd_service credstore_service keystore_compat_hal_service keystore_maintenance_service keystore_metrics_service keystore_service legacykeystore_service lpdump_service mdns_service mediaserver_service mediametrics_service mediaextractor_service mediadrmserver_service mediatranscoding_service netd_service nfc_service ondevicepersonalization_system_service ot_daemon_service profiling_service radio_service secure_element_service service_manager_service storaged_service surfaceflinger_service system_app_service system_net_netd_service system_suspend_control_internal_service system_suspend_control_service update_engine_service update_engine_stable_service virtualization_service virtual_camera_service virtual_touchpad_service vold_service vr_hwc_service vrflinger_vsync_service accessibility_service account_service activity_service activity_task_service adb_service adservices_manager_service alarm_service app_binding_service app_function_service app_hibernation_service app_integrity_service app_prediction_service app_search_service appops_service appwidget_service archive_service assetatlas_service attestation_verification_service audio_service auth_service autofill_service backup_service batterystats_service battery_service binder_calls_stats_service blob_store_service bluetooth_manager_service broadcastradio_service cacheinfo_service cameraproxy_service clipboard_service cloudsearch_service contexthub_service contextual_search_service crossprofileapps_service IProxyService_service companion_device_service connectivity_native_service connectivity_service connmetrics_service consumer_ir_service content_capture_service content_suggestions_service content_service country_detector_service coverage_service cpuinfo_service cpu_monitor_service credential_service dataloader_manager_service dbinfo_service device_config_service device_policy_service device_state_service deviceidle_service device_identifiers_service devicestoragemonitor_service diskstats_service display_service domain_verification_service color_display_service ecm_enhanced_confirmation_service external_vibrator_service file_integrity_service font_service netd_listener_service network_watchlist_service devicelock_service DockObserver_service dreams_service dropbox_service ethernet_service biometric_service bugreport_service platform_compat_service face_service fingerprint_service fwk_altitude_service fwk_stats_service fwk_sensor_service fwk_vibrator_control_service game_service gfxinfo_service gnss_time_update_service grammatical_inflection_service graphicsstats_service hardware_service hardware_properties_service hdmi_control_service healthconnect_service hint_service imms_service incremental_service input_method_service input_service intrusion_detection_service ipsec_service iris_service jobscheduler_service launcherapps_service legacy_permission_service light_service locale_service location_service location_time_zone_manager_service lock_settings_service looper_stats_service media_communication_service media_metrics_service media_projection_service media_quality_service media_router_service media_session_service meminfo_service memtrackproxy_service midi_service mount_service music_recognition_service nearby_service netpolicy_service netstats_service network_management_service network_score_service network_stack_service network_time_update_service notification_service oem_lock_service otadexopt_service overlay_service pac_proxy_service package_service package_native_service people_service permission_service permissionmgr_service permission_checker_service persistent_data_block_service pinner_service powerstats_service power_service print_service processinfo_service procstats_service reboot_readiness_service recovery_service registry_service remote_auth_service remote_provisioning_service resources_manager_service restrictions_service role_service rollback_service runtime_service rttmanager_service samplingprofiler_service scheduling_policy_service search_service search_ui_service sec_key_att_app_id_provider_service security_state_service selection_toolbar_service sensitive_content_protection_service sensorservice_service sensor_privacy_service serial_service servicediscovery_service settings_service shortcut_service slice_service smartspace_service statusbar_service storagestats_service sdk_sandbox_service system_config_service system_server_dumper_service system_update_service soundtrigger_middleware_service speech_recognition_service tare_service task_service testharness_service textclassification_service textservices_service texttospeech_service telecom_service thermal_service threadnetwork_service timedetector_service timezonedetector_service translation_service trust_service tv_ad_service tv_iapp_service tv_input_service tv_tuner_resource_mgr_service uimode_service updatelock_service uri_grants_service usagestats_service usb_service user_service uwb_service vcn_management_service vibrator_service vibrator_manager_service virtual_device_service virtual_device_native_service voiceinteraction_service vpn_management_service vr_manager_service wallpaper_service wallpaper_effects_generation_service webviewupdate_service wifip2p_service wifiscanner_service wifi_service wifinl80211_service wifiaware_service wifi_usd_service window_service inputflinger_service tethering_service emergency_affordance_service hal_audio_service hal_audiocontrol_service hal_authgraph_service hal_authsecret_service hal_bluetooth_service hal_bootctl_service hal_broadcastradio_service hal_camera_service hal_can_controller_service hal_cas_service hal_codec2_service hal_confirmationui_service hal_contexthub_service hal_drm_service hal_dumpstate_service hal_evs_service hal_face_service hal_fastboot_service hal_fingerprint_service hal_gnss_service hal_graphics_allocator_service hal_graphics_composer_service hal_graphics_mapper_service hal_health_service hal_health_storage_service hal_identity_service hal_input_processor_service hal_ir_service hal_ivn_service hal_keymint_service hal_light_service hal_macsec_service hal_mediaquality_service hal_memtrack_service hal_neuralnetworks_service hal_nfc_service hal_oemlock_service hal_power_service hal_power_stats_service hal_radio_service hal_rebootescrow_service hal_remoteaccess_service hal_remotelyprovisionedcomponent_avf_service hal_remotelyprovisionedcomponent_service hal_sensors_service hal_secretkeeper_service hal_secureclock_service hal_secure_element_service hal_sharedsecret_service hal_system_suspend_service hal_tetheroffload_service hal_thermal_service hal_tv_hdmi_cec_service hal_tv_hdmi_connection_service hal_tv_hdmi_earc_service hal_tv_input_service hal_threadnetwork_service hal_tv_tuner_service hal_usb_service hal_usb_gadget_service hal_uwb_service hal_vehicle_service hal_vibrator_service hal_weaver_service hal_nlinterceptor_service hal_wifi_service hal_wifi_hostapd_service hal_wifi_supplicant_service hal_gatekeeper_service hal_vm_capabilities_service ambient_context_service authentication_policy_service attention_service bg_install_control_service compos_service communal_service dynamic_system_service feature_flags_service fwk_devicestate_service gsi_service incidentcompanion_service logcat_service logd_service mediatuner_service mmd_service on_device_intelligence_service profcollectd_service protolog_configuration_service resolver_service rkpd_registrar_service rkpd_refresh_service rkp_cert_processor_service safety_center_service stats_service statsbootstrap_service statscompanion_service statsmanager_service supervision_service tracingproxy_service tradeinmode_service transparency_service vfio_handler_service virtualization_maintenance_service vm_tethering_service vmnic_service uce_service wearable_sensing_service wifi_mainline_supplicant_service dynamic_instrumentation_service advanced_protection_service ranging_service ))
+(typeattributeset service_manager_type (aidl_lazy_test_service apc_service apex_service artd_service artd_pre_reboot_service audioserver_service authorization_service batteryproperties_service bluetooth_service cameraserver_service fwk_camera_service default_android_service device_config_updatable_service dexopt_chroot_setup_service dnsresolver_service drmserver_service dumpstate_service evsmanagerd_service fingerprintd_service fwk_automotive_display_service fwk_vold_service gatekeeper_service gpu_service idmap_service incident_service installd_service credstore_service keystore_compat_hal_service keystore_maintenance_service keystore_metrics_service keystore_service legacykeystore_service lpdump_service mdns_service mediaserver_service mediametrics_service mediaextractor_service mediadrmserver_service mediatranscoding_service netd_service nfc_service ondevicepersonalization_system_service ot_daemon_service profiling_service radio_service secure_element_service service_manager_service storaged_service surfaceflinger_service system_app_service system_net_netd_service system_suspend_control_internal_service system_suspend_control_service update_engine_service update_engine_stable_service virtualization_service virtual_camera_service virtual_touchpad_service vold_service vr_hwc_service vrflinger_vsync_service accessibility_service account_service activity_service activity_task_service adb_service adservices_manager_service alarm_service app_binding_service app_function_service app_hibernation_service app_integrity_service app_prediction_service app_search_service appops_service appwidget_service archive_service assetatlas_service attestation_verification_service audio_service auth_service autofill_service backup_service batterystats_service battery_service binder_calls_stats_service blob_store_service bluetooth_manager_service broadcastradio_service cacheinfo_service cameraproxy_service clipboard_service cloudsearch_service contexthub_service contextual_search_service crossprofileapps_service IProxyService_service companion_device_service connectivity_native_service connectivity_service connmetrics_service consumer_ir_service content_capture_service content_suggestions_service content_service country_detector_service coverage_service cpuinfo_service cpu_monitor_service credential_service dataloader_manager_service dbinfo_service device_config_service device_policy_service device_state_service deviceidle_service device_identifiers_service devicestoragemonitor_service diskstats_service display_service domain_verification_service color_display_service ecm_enhanced_confirmation_service external_vibrator_service file_integrity_service font_service netd_listener_service network_watchlist_service devicelock_service DockObserver_service dreams_service dropbox_service ethernet_service biometric_service bugreport_service platform_compat_service face_service fingerprint_service fwk_altitude_service fwk_stats_service fwk_sensor_service fwk_vibrator_control_service game_service gfxinfo_service gnss_time_update_service grammatical_inflection_service graphicsstats_service hardware_service hardware_properties_service hdmi_control_service healthconnect_service hint_service imms_service incremental_service input_method_service input_service intrusion_detection_service ipsec_service iris_service jobscheduler_service launcherapps_service legacy_permission_service light_service locale_service location_service location_time_zone_manager_service lock_settings_service looper_stats_service media_communication_service media_metrics_service media_projection_service media_quality_service media_router_service media_session_service meminfo_service memtrackproxy_service midi_service mount_service music_recognition_service nearby_service netpolicy_service netstats_service network_management_service network_score_service network_stack_service network_time_update_service notification_service oem_lock_service otadexopt_service overlay_service pac_proxy_service package_service package_native_service people_service permission_service permissionmgr_service permission_checker_service persistent_data_block_service pinner_service powerstats_service power_service print_service processinfo_service procstats_service reboot_readiness_service recovery_service registry_service remote_auth_service remote_provisioning_service resources_manager_service restrictions_service role_service rollback_service runtime_service rttmanager_service samplingprofiler_service scheduling_policy_service search_service search_ui_service sec_key_att_app_id_provider_service security_state_service selection_toolbar_service sensitive_content_protection_service sensorservice_service sensor_privacy_service serial_service servicediscovery_service settings_service shortcut_service slice_service smartspace_service statusbar_service storagestats_service sdk_sandbox_service system_config_service system_server_dumper_service system_update_service soundtrigger_middleware_service speech_recognition_service tare_service task_service testharness_service textclassification_service textservices_service texttospeech_service telecom_service thermal_service threadnetwork_service timedetector_service timezonedetector_service translation_service trust_service tv_ad_service tv_iapp_service tv_input_service tv_tuner_resource_mgr_service uimode_service updatelock_service uri_grants_service usagestats_service usb_service user_service uwb_service vcn_management_service vibrator_service vibrator_manager_service virtual_device_service virtual_device_native_service voiceinteraction_service vpn_management_service vr_manager_service wallpaper_service wallpaper_effects_generation_service webviewupdate_service wifip2p_service wifiscanner_service wifi_service wifinl80211_service wifiaware_service wifi_usd_service window_service inputflinger_service tethering_service emergency_affordance_service hal_audio_service hal_audiocontrol_service hal_authgraph_service hal_authsecret_service hal_bluetooth_service hal_bootctl_service hal_broadcastradio_service hal_camera_service hal_can_controller_service hal_cas_service hal_codec2_service hal_confirmationui_service hal_contexthub_service hal_drm_service hal_dumpstate_service hal_evs_service hal_face_service hal_fastboot_service hal_fingerprint_service hal_gnss_service hal_graphics_allocator_service hal_graphics_composer_service hal_graphics_mapper_service hal_health_service hal_health_storage_service hal_hwcrypto_service hal_identity_service hal_input_processor_service hal_ir_service hal_ivn_service hal_keymint_service hal_light_service hal_macsec_service hal_mediaquality_service hal_memtrack_service hal_neuralnetworks_service hal_nfc_service hal_oemlock_service hal_power_service hal_power_stats_service hal_radio_service hal_rebootescrow_service hal_remoteaccess_service hal_remotelyprovisionedcomponent_avf_service hal_remotelyprovisionedcomponent_service hal_sensors_service hal_secretkeeper_service hal_secureclock_service hal_secure_element_service hal_sharedsecret_service hal_system_suspend_service hal_tetheroffload_service hal_thermal_service hal_tv_hdmi_cec_service hal_tv_hdmi_connection_service hal_tv_hdmi_earc_service hal_tv_input_service hal_threadnetwork_service hal_tv_tuner_service hal_usb_service hal_usb_gadget_service hal_uwb_service hal_vehicle_service hal_vibrator_service hal_weaver_service hal_nlinterceptor_service hal_wifi_service hal_wifi_hostapd_service hal_wifi_supplicant_service hal_gatekeeper_service hal_vm_capabilities_service ambient_context_service authentication_policy_service attention_service bg_install_control_service compos_service communal_service dynamic_system_service feature_flags_service fwk_devicestate_service gsi_service incidentcompanion_service logcat_service logd_service mediatuner_service mmd_service on_device_intelligence_service profcollectd_service protolog_configuration_service resolver_service rkpd_registrar_service rkpd_refresh_service rkp_cert_processor_service safety_center_service stats_service statsbootstrap_service statscompanion_service statsmanager_service supervision_service tracingproxy_service tradeinmode_service transparency_service vfio_handler_service virtualization_maintenance_service vm_tethering_service vmnic_service uce_service wearable_sensing_service wifi_mainline_supplicant_service dynamic_instrumentation_service advanced_protection_service ranging_service ))
 (typeattribute hwservice_manager_type)
 (typeattributeset hwservice_manager_type (default_android_hwservice fwk_camera_hwservice fwk_display_hwservice fwk_scheduler_hwservice fwk_sensor_hwservice fwk_stats_hwservice fwk_automotive_display_hwservice hal_atrace_hwservice hal_audio_hwservice hal_audiocontrol_hwservice hal_authsecret_hwservice hal_bluetooth_hwservice hal_bootctl_hwservice hal_broadcastradio_hwservice hal_camera_hwservice hal_can_bus_hwservice hal_can_controller_hwservice hal_confirmationui_hwservice hal_contexthub_hwservice hal_dumpstate_hwservice hal_evs_hwservice hal_face_hwservice hal_fingerprint_hwservice hal_gatekeeper_hwservice hal_gnss_hwservice hal_graphics_composer_hwservice hal_health_hwservice hal_health_storage_hwservice hal_input_classifier_hwservice hal_ir_hwservice hal_keymaster_hwservice hal_light_hwservice hal_lowpan_hwservice hal_memtrack_hwservice hal_nfc_hwservice hal_oemlock_hwservice hal_power_hwservice hal_power_stats_hwservice hal_secure_element_hwservice hal_sensors_hwservice hal_telephony_hwservice hal_tetheroffload_hwservice hal_thermal_hwservice hal_tv_cec_hwservice hal_tv_input_hwservice hal_tv_tuner_hwservice hal_usb_gadget_hwservice hal_usb_hwservice hal_vehicle_hwservice hal_vibrator_hwservice hal_vr_hwservice hal_weaver_hwservice hal_wifi_hostapd_hwservice hal_wifi_hwservice hal_wifi_supplicant_hwservice system_net_netd_hwservice system_suspend_hwservice system_wifi_keystore_hwservice fwk_bufferhub_hwservice hal_cas_hwservice hal_codec2_hwservice hal_configstore_ISurfaceFlingerConfigs hal_drm_hwservice hal_graphics_allocator_hwservice hal_graphics_mapper_hwservice hal_neuralnetworks_hwservice hal_omx_hwservice hal_renderscript_hwservice hidl_allocator_hwservice hidl_base_hwservice hidl_manager_hwservice hidl_memory_hwservice hidl_token_hwservice hal_lazy_test_hwservice ))
 (typeattribute same_process_hwservice)
@@ -797,7 +797,7 @@
 (typeattribute vndservice_manager_type)
 (typeattributeset vndservice_manager_type (service_manager_vndservice default_android_vndservice ))
 (typeattribute hal_service_type)
-(typeattributeset hal_service_type (hal_audio_service hal_audiocontrol_service hal_authgraph_service hal_authsecret_service hal_bluetooth_service hal_bootctl_service hal_broadcastradio_service hal_camera_service hal_can_controller_service hal_cas_service hal_codec2_service hal_confirmationui_service hal_contexthub_service hal_drm_service hal_dumpstate_service hal_evs_service hal_face_service hal_fastboot_service hal_fingerprint_service hal_gnss_service hal_graphics_allocator_service hal_graphics_composer_service hal_graphics_mapper_service hal_health_service hal_health_storage_service hal_identity_service hal_input_processor_service hal_ir_service hal_ivn_service hal_keymint_service hal_light_service hal_macsec_service hal_mediaquality_service hal_memtrack_service hal_neuralnetworks_service hal_nfc_service hal_oemlock_service hal_power_service hal_power_stats_service hal_radio_service hal_rebootescrow_service hal_remoteaccess_service hal_remotelyprovisionedcomponent_avf_service hal_remotelyprovisionedcomponent_service hal_sensors_service hal_secretkeeper_service hal_secureclock_service hal_secure_element_service hal_sharedsecret_service hal_system_suspend_service hal_tetheroffload_service hal_thermal_service hal_tv_hdmi_cec_service hal_tv_hdmi_connection_service hal_tv_hdmi_earc_service hal_tv_input_service hal_threadnetwork_service hal_tv_tuner_service hal_usb_service hal_usb_gadget_service hal_uwb_service hal_vehicle_service hal_vibrator_service hal_weaver_service hal_nlinterceptor_service hal_wifi_service hal_wifi_hostapd_service hal_wifi_supplicant_service hal_gatekeeper_service hal_vm_capabilities_service ))
+(typeattributeset hal_service_type (hal_audio_service hal_audiocontrol_service hal_authgraph_service hal_authsecret_service hal_bluetooth_service hal_bootctl_service hal_broadcastradio_service hal_camera_service hal_can_controller_service hal_cas_service hal_codec2_service hal_confirmationui_service hal_contexthub_service hal_drm_service hal_dumpstate_service hal_evs_service hal_face_service hal_fastboot_service hal_fingerprint_service hal_gnss_service hal_graphics_allocator_service hal_graphics_composer_service hal_graphics_mapper_service hal_health_service hal_health_storage_service hal_hwcrypto_service hal_identity_service hal_input_processor_service hal_ir_service hal_ivn_service hal_keymint_service hal_light_service hal_macsec_service hal_mediaquality_service hal_memtrack_service hal_neuralnetworks_service hal_nfc_service hal_oemlock_service hal_power_service hal_power_stats_service hal_radio_service hal_rebootescrow_service hal_remoteaccess_service hal_remotelyprovisionedcomponent_avf_service hal_remotelyprovisionedcomponent_service hal_sensors_service hal_secretkeeper_service hal_secureclock_service hal_secure_element_service hal_sharedsecret_service hal_system_suspend_service hal_tetheroffload_service hal_thermal_service hal_tv_hdmi_cec_service hal_tv_hdmi_connection_service hal_tv_hdmi_earc_service hal_tv_input_service hal_threadnetwork_service hal_tv_tuner_service hal_usb_service hal_usb_gadget_service hal_uwb_service hal_vehicle_service hal_vibrator_service hal_weaver_service hal_nlinterceptor_service hal_wifi_service hal_wifi_hostapd_service hal_wifi_supplicant_service hal_gatekeeper_service hal_vm_capabilities_service ))
 (typeattribute mlstrustedsubject)
 (typeattributeset mlstrustedsubject (adbd artd bluetooth bufferhubd drmserver dumpstate pdx_display_client_endpoint_socket pdx_display_manager_endpoint_socket pdx_display_screenshot_endpoint_socket pdx_display_vsync_endpoint_socket pdx_performance_client_endpoint_socket pdx_bufferhub_client_endpoint_socket heapprofd hwservicemanager incidentd init installd kernel keystore llkd lmkd logd mdnsd mediadrmserver mediaextractor mediaserver netd network_stack nfc performanced prng_seeder radio rss_hwm_reset runas servicemanager shell simpleperf_app_runner statsd surfaceflinger system_app system_server tombstoned traced traced_perf traced_probes uncrypt vendor_init vold vold_prepare_subdirs webview_zygote zygote aconfigd aconfigd_mainline cppreopts device_as_webcam otapreopt_slot postinstall_dexopt profcollectd simpleperf_boot storaged virtualizationservice ))
 (typeattribute mlstrustedobject)
@@ -4084,6 +4084,8 @@
 (roletype object_r hal_health_service)
 (type hal_health_storage_service)
 (roletype object_r hal_health_storage_service)
+(type hal_hwcrypto_service)
+(roletype object_r hal_hwcrypto_service)
 (type hal_identity_service)
 (roletype object_r hal_identity_service)
 (type hal_input_processor_service)
@@ -5011,6 +5013,8 @@
 (roletype object_r fstype_prop)
 (type log_file_logger_prop)
 (roletype object_r log_file_logger_prop)
+(type mmd_shared_status_prop)
+(roletype object_r mmd_shared_status_prop)
 (type persist_sysui_builder_extras_prop)
 (roletype object_r persist_sysui_builder_extras_prop)
 (type persist_sysui_ranking_update_prop)
@@ -23360,12 +23364,16 @@
 (typetransition init mmd_exec process mmd)
 (allow mmd property_socket (sock_file (write)))
 (allow mmd init (unix_stream_socket (connectto)))
+(allow mmd mmd_shared_status_prop (property_service (set)))
+(allow mmd mmd_shared_status_prop (file (read getattr map open)))
+(allow mmd property_socket (sock_file (write)))
+(allow mmd init (unix_stream_socket (connectto)))
 (allow mmd mmd_status_prop (property_service (set)))
 (allow mmd mmd_status_prop (file (read getattr map open)))
 (allow mmd mmd_prop (file (read getattr map open)))
 (allow mmd device_config_mmd_native_prop (file (read getattr map open)))
 (allow mmd mmd_service (service_manager (add find)))
-;;* lmx 14 system/sepolicy/private/mmd.te
+;;* lmx 15 system/sepolicy/private/mmd.te
 
 (neverallow base_typeattr_807 mmd_service (service_manager (add)))
 ;;* lme
@@ -25383,21 +25391,26 @@
 
 ;;* lmx 89 system/sepolicy/private/property.te
 
-(neverallow base_typeattr_232 persist_sysui_builder_extras_prop (property_service (set)))
+(neverallow base_typeattr_232 mmd_shared_status_prop (property_service (set)))
 ;;* lme
 
 ;;* lmx 90 system/sepolicy/private/property.te
 
-(neverallow base_typeattr_232 persist_sysui_ranking_update_prop (property_service (set)))
+(neverallow base_typeattr_232 persist_sysui_builder_extras_prop (property_service (set)))
 ;;* lme
 
 ;;* lmx 91 system/sepolicy/private/property.te
 
-(neverallow base_typeattr_232 page_size_prop (property_service (set)))
+(neverallow base_typeattr_232 persist_sysui_ranking_update_prop (property_service (set)))
 ;;* lme
 
 ;;* lmx 92 system/sepolicy/private/property.te
 
+(neverallow base_typeattr_232 page_size_prop (property_service (set)))
+;;* lme
+
+;;* lmx 93 system/sepolicy/private/property.te
+
 (neverallow base_typeattr_232 pm_16kb_app_compat_prop (property_service (set)))
 ;;* lme
 
@@ -25405,7 +25418,7 @@
 (allow vendor_init init (unix_stream_socket (connectto)))
 (allow vendor_init avf_virtualizationservice_prop (property_service (set)))
 (allow vendor_init avf_virtualizationservice_prop (file (read getattr map open)))
-;;* lmx 114 system/sepolicy/private/property.te
+;;* lmx 115 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_233 avf_virtualizationservice_prop (property_service (set)))
 ;;* lme
@@ -25414,7 +25427,7 @@
 (allow vendor_init init (unix_stream_socket (connectto)))
 (allow vendor_init high_barometer_quality_prop (property_service (set)))
 (allow vendor_init high_barometer_quality_prop (file (read getattr map open)))
-;;* lmx 118 system/sepolicy/private/property.te
+;;* lmx 119 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_233 high_barometer_quality_prop (property_service (set)))
 ;;* lme
@@ -25423,7 +25436,7 @@
 (allow vendor_init init (unix_stream_socket (connectto)))
 (allow vendor_init mmd_prop (property_service (set)))
 (allow vendor_init mmd_prop (file (read getattr map open)))
-;;* lmx 119 system/sepolicy/private/property.te
+;;* lmx 120 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_233 mmd_prop (property_service (set)))
 ;;* lme
@@ -25432,7 +25445,7 @@
 (allow vendor_init init (unix_stream_socket (connectto)))
 (allow vendor_init mmd_shared_prop (property_service (set)))
 (allow vendor_init mmd_shared_prop (file (read getattr map open)))
-;;* lmx 120 system/sepolicy/private/property.te
+;;* lmx 121 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_233 mmd_shared_prop (property_service (set)))
 ;;* lme
@@ -25441,48 +25454,48 @@
 (allow vendor_init init (unix_stream_socket (connectto)))
 (allow vendor_init prefetch_boot_prop (property_service (set)))
 (allow vendor_init prefetch_boot_prop (file (read getattr map open)))
-;;* lmx 121 system/sepolicy/private/property.te
+;;* lmx 122 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_233 prefetch_boot_prop (property_service (set)))
 ;;* lme
 
 (allow property_type tmpfs (filesystem (associate)))
-;;* lmx 165 system/sepolicy/private/property.te
+;;* lmx 166 system/sepolicy/private/property.te
 
 (neverallow domain base_typeattr_850 (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 165 system/sepolicy/private/property.te
+;;* lmx 166 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_232 base_typeattr_851 (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 165 system/sepolicy/private/property.te
+;;* lmx 166 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_232 base_typeattr_852 (property_service (set)))
 ;;* lme
 
-;;* lmx 165 system/sepolicy/private/property.te
+;;* lmx 166 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_234 base_typeattr_853 (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 165 system/sepolicy/private/property.te
+;;* lmx 166 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_340 base_typeattr_854 (property_service (set)))
 ;;* lme
 
-;;* lmx 208 system/sepolicy/private/property.te
+;;* lmx 209 system/sepolicy/private/property.te
 
 (neverallow domain property_type (file (ioctl lock)))
 ;;* lme
 
-;;* lmx 234 system/sepolicy/private/property.te
+;;* lmx 235 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_239 base_typeattr_855 (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 242 system/sepolicy/private/property.te
+;;* lmx 243 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_233 ctl_sigstop_prop (property_service (set)))
 ;;* lme
@@ -25495,395 +25508,395 @@
 (dontaudit domain ctl_mdnsd_prop (property_service (set)))
 (dontaudit domain ctl_rildaemon_prop (property_service (set)))
 (dontaudit domain ctl_default_prop (property_service (set)))
-;;* lmx 261 system/sepolicy/private/property.te
+;;* lmx 262 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_856 init_storage_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 266 system/sepolicy/private/property.te
+;;* lmx 267 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_238 init_svc_debug_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 273 system/sepolicy/private/property.te
+;;* lmx 274 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_857 init_svc_debug_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 284 system/sepolicy/private/property.te
+;;* lmx 285 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_858 misctrl_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 290 system/sepolicy/private/property.te
+;;* lmx 291 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_859 misctrl_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 292 system/sepolicy/private/property.te
+;;* lmx 293 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_860 base_typeattr_861 (property_service (set)))
 ;;* lme
 
-;;* lmx 292 system/sepolicy/private/property.te
+;;* lmx 293 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_862 nfc_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 292 system/sepolicy/private/property.te
+;;* lmx 293 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_863 radio_control_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 292 system/sepolicy/private/property.te
+;;* lmx 293 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_864 radio_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 292 system/sepolicy/private/property.te
+;;* lmx 293 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_865 bluetooth_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 292 system/sepolicy/private/property.te
+;;* lmx 293 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_866 exported_bluetooth_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 292 system/sepolicy/private/property.te
+;;* lmx 293 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_867 exported_camera_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 292 system/sepolicy/private/property.te
+;;* lmx 293 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_868 wifi_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 292 system/sepolicy/private/property.te
+;;* lmx 293 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_869 wifi_hal_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 292 system/sepolicy/private/property.te
+;;* lmx 293 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_860 base_typeattr_870 (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 292 system/sepolicy/private/property.te
+;;* lmx 293 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_871 dalvik_dynamic_config_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 292 system/sepolicy/private/property.te
+;;* lmx 293 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_862 nfc_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 292 system/sepolicy/private/property.te
+;;* lmx 293 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_864 radio_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 292 system/sepolicy/private/property.te
+;;* lmx 293 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_865 bluetooth_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 292 system/sepolicy/private/property.te
+;;* lmx 293 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_868 wifi_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 292 system/sepolicy/private/property.te
+;;* lmx 293 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_389 suspend_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 292 system/sepolicy/private/property.te
+;;* lmx 293 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_238 suspend_debug_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 292 system/sepolicy/private/property.te
+;;* lmx 293 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_233 high_barometer_quality_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 292 system/sepolicy/private/property.te
+;;* lmx 293 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_857 suspend_debug_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
 (dontaudit system_suspend suspend_debug_prop (file (ioctl read getattr lock map open watch watch_reads)))
-;;* lmx 489 system/sepolicy/private/property.te
+;;* lmx 490 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_872 base_typeattr_873 (property_service (set)))
 ;;* lme
 
-;;* lmx 509 system/sepolicy/private/property.te
+;;* lmx 510 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_389 ffs_config_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 (neverallow base_typeattr_389 ffs_control_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 517 system/sepolicy/private/property.te
+;;* lmx 518 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_430 userspace_reboot_log_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 526 system/sepolicy/private/property.te
+;;* lmx 527 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_430 system_adbd_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 538 system/sepolicy/private/property.te
+;;* lmx 539 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_874 adbd_config_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 548 system/sepolicy/private/property.te
+;;* lmx 549 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_875 adbd_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 556 system/sepolicy/private/property.te
+;;* lmx 557 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_238 apexd_payload_metadata_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 566 system/sepolicy/private/property.te
+;;* lmx 567 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_844 userspace_reboot_test_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 575 system/sepolicy/private/property.te
+;;* lmx 576 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_388 surfaceflinger_color_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 582 system/sepolicy/private/property.te
+;;* lmx 583 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_238 libc_debug_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 597 system/sepolicy/private/property.te
+;;* lmx 598 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_876 arm64_memtag_prop (property_service (set)))
 (neverallow base_typeattr_876 gwp_asan_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 606 system/sepolicy/private/property.te
+;;* lmx 607 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_877 kcmdline_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 613 system/sepolicy/private/property.te
+;;* lmx 614 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_388 zram_control_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 620 system/sepolicy/private/property.te
+;;* lmx 621 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_388 dalvik_runtime_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 629 system/sepolicy/private/property.te
+;;* lmx 630 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_389 usb_config_prop (property_service (set)))
 (neverallow base_typeattr_389 usb_control_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 638 system/sepolicy/private/property.te
+;;* lmx 639 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_430 provisioned_prop (property_service (set)))
 (neverallow base_typeattr_430 retaildemo_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 647 system/sepolicy/private/property.te
+;;* lmx 648 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_389 provisioned_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 (neverallow base_typeattr_389 retaildemo_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 655 system/sepolicy/private/property.te
+;;* lmx 656 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_238 init_service_status_prop (property_service (set)))
 (neverallow base_typeattr_238 init_service_status_private_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 664 system/sepolicy/private/property.te
+;;* lmx 665 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_878 telephony_status_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 672 system/sepolicy/private/property.te
+;;* lmx 673 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_233 graphics_config_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 680 system/sepolicy/private/property.te
+;;* lmx 681 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_879 surfaceflinger_display_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 687 system/sepolicy/private/property.te
+;;* lmx 688 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_860 packagemanager_config_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 693 system/sepolicy/private/property.te
+;;* lmx 694 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_389 keyguard_config_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 700 system/sepolicy/private/property.te
+;;* lmx 701 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_238 localization_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 708 system/sepolicy/private/property.te
+;;* lmx 709 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_880 oem_unlock_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 714 system/sepolicy/private/property.te
+;;* lmx 715 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_389 storagemanager_config_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 722 system/sepolicy/private/property.te
+;;* lmx 723 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_881 sendbug_config_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 730 system/sepolicy/private/property.te
+;;* lmx 731 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_881 camera_calibration_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 738 system/sepolicy/private/property.te
+;;* lmx 739 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_882 hal_dumpstate_config_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 749 system/sepolicy/private/property.te
+;;* lmx 750 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_238 lower_kptr_restrict_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 754 system/sepolicy/private/property.te
+;;* lmx 755 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_238 zygote_wrap_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 759 system/sepolicy/private/property.te
+;;* lmx 760 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_238 verity_status_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 765 system/sepolicy/private/property.te
+;;* lmx 766 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_233 setupwizard_mode_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 770 system/sepolicy/private/property.te
+;;* lmx 771 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_238 setupwizard_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 779 system/sepolicy/private/property.te
+;;* lmx 780 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_383 build_config_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 785 system/sepolicy/private/property.te
+;;* lmx 786 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_844 sqlite_log_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 791 system/sepolicy/private/property.te
+;;* lmx 792 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_372 sqlite_log_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 796 system/sepolicy/private/property.te
+;;* lmx 797 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_238 default_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 800 system/sepolicy/private/property.te
+;;* lmx 801 system/sepolicy/private/property.te
 
 (neverallow domain system_and_vendor_property_type (file (ioctl read write create getattr setattr lock relabelfrom relabelto append map unlink link rename execute quotaon mounton audit_access open execmod watch watch_mount watch_sb watch_with_perm watch_reads execute_no_trans entrypoint)))
 (neverallow domain system_and_vendor_property_type (property_service (set)))
 ;;* lme
 
-;;* lmx 809 system/sepolicy/private/property.te
+;;* lmx 810 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_883 remote_prov_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 814 system/sepolicy/private/property.te
+;;* lmx 815 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_238 remote_prov_cert_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 821 system/sepolicy/private/property.te
+;;* lmx 822 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_844 rollback_test_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 827 system/sepolicy/private/property.te
+;;* lmx 828 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_244 ctl_apex_load_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 835 system/sepolicy/private/property.te
+;;* lmx 836 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_884 ctl_apex_load_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 841 system/sepolicy/private/property.te
+;;* lmx 842 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_244 apex_ready_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 849 system/sepolicy/private/property.te
+;;* lmx 850 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_885 apex_ready_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 857 system/sepolicy/private/property.te
+;;* lmx 858 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_886 profcollectd_node_id_prop (file (ioctl read getattr lock map open watch watch_reads)))
 ;;* lme
 
-;;* lmx 862 system/sepolicy/private/property.te
+;;* lmx 863 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_238 log_file_logger_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 868 system/sepolicy/private/property.te
+;;* lmx 869 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_233 usb_uvc_enabled_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 875 system/sepolicy/private/property.te
+;;* lmx 876 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_887 usb_uvc_enabled_prop (file (ioctl read write create setattr lock relabelfrom append unlink link rename open watch watch_mount watch_sb watch_with_perm watch_reads)))
 ;;* lme
 
-;;* lmx 881 system/sepolicy/private/property.te
+;;* lmx 882 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_233 pm_archiving_enabled_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 888 system/sepolicy/private/property.te
+;;* lmx 889 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_844 bionic_linker_16kb_app_compat_prop (property_service (set)))
 ;;* lme
 
-;;* lmx 895 system/sepolicy/private/property.te
+;;* lmx 896 system/sepolicy/private/property.te
 
 (neverallow base_typeattr_844 pm_16kb_app_compat_prop (property_service (set)))
 ;;* lme
@@ -26789,7 +26802,7 @@
 (neverallow base_typeattr_930 fwk_sensor_hwservice (hwservice_manager (add)))
 ;;* lme
 
-;;* lmx 86 system/sepolicy/private/service.te
+;;* lmx 88 system/sepolicy/private/service.te
 
 (neverallow domain base_typeattr_931 (service_manager (add find)))
 ;;* lme
@@ -31037,6 +31050,7 @@
 (allow vendor_init zram_control_prop (file (read getattr map open)))
 (allow vendor_init boot_status_prop (file (read getattr map open)))
 (allow vendor_init exported3_system_prop (file (read getattr map open)))
+(allow vendor_init mmd_shared_status_prop (file (read getattr map open)))
 (allow vendor_init ota_prop (file (read getattr map open)))
 (allow vendor_init power_debug_prop (file (read getattr map open)))
 (allow vendor_init provisioned_prop (file (read getattr map open)))
@@ -31050,7 +31064,7 @@
 (allow vendor_init dck_prop (file (read getattr map open)))
 (allow vendor_init device_config_vendor_system_native_prop (file (read getattr map open)))
 (allow vendor_init device_config_vendor_system_native_boot_prop (file (read getattr map open)))
-;;* lmx 341 system/sepolicy/private/vendor_init.te
+;;* lmx 342 system/sepolicy/private/vendor_init.te
 
 (neverallow vendor_init base_typeattr_1024 (socket (connect sendto)))
 (neverallow vendor_init base_typeattr_1024 (tcp_socket (connect sendto)))
@@ -31111,58 +31125,58 @@
 (neverallow vendor_init base_typeattr_1024 (xdp_socket (connect sendto)))
 ;;* lme
 
-;;* lmx 341 system/sepolicy/private/vendor_init.te
+;;* lmx 342 system/sepolicy/private/vendor_init.te
 
 (neverallow vendor_init base_typeattr_1024 (unix_stream_socket (connectto)))
 ;;* lme
 
-;;* lmx 346 system/sepolicy/private/vendor_init.te
+;;* lmx 347 system/sepolicy/private/vendor_init.te
 
 (neverallow domain vendor_init (process (dyntransition)))
 ;;* lme
 
-;;* lmx 347 system/sepolicy/private/vendor_init.te
+;;* lmx 348 system/sepolicy/private/vendor_init.te
 
 (neverallow base_typeattr_238 vendor_init (process (transition)))
 ;;* lme
 
-;;* lmx 348 system/sepolicy/private/vendor_init.te
+;;* lmx 349 system/sepolicy/private/vendor_init.te
 
 (neverallow vendor_init base_typeattr_761 (file (entrypoint)))
 ;;* lme
 
-;;* lmx 351 system/sepolicy/private/vendor_init.te
+;;* lmx 352 system/sepolicy/private/vendor_init.te
 
 (neverallow vendor_init app_data_file_type (lnk_file (read)))
 ;;* lme
 
-;;* lmx 352 system/sepolicy/private/vendor_init.te
+;;* lmx 353 system/sepolicy/private/vendor_init.te
 
 (neverallow vendor_init shell_data_file (lnk_file (read)))
 ;;* lme
 
-;;* lmx 354 system/sepolicy/private/vendor_init.te
+;;* lmx 355 system/sepolicy/private/vendor_init.te
 
 (neverallow vendor_init shell_data_file (dir (write add_name remove_name)))
 ;;* lme
 
-;;* lmx 357 system/sepolicy/private/vendor_init.te
+;;* lmx 358 system/sepolicy/private/vendor_init.te
 
 (neverallow vendor_init fs_type (file (execute_no_trans)))
 (neverallow vendor_init file_type (file (execute_no_trans)))
 ;;* lme
 
-;;* lmx 360 system/sepolicy/private/vendor_init.te
+;;* lmx 361 system/sepolicy/private/vendor_init.te
 
 (neverallow vendor_init service_manager_type (service_manager (add find)))
 ;;* lme
 
-;;* lmx 361 system/sepolicy/private/vendor_init.te
+;;* lmx 362 system/sepolicy/private/vendor_init.te
 
 (neverallow vendor_init servicemanager (service_manager (list)))
 ;;* lme
 
-;;* lmx 364 system/sepolicy/private/vendor_init.te
+;;* lmx 365 system/sepolicy/private/vendor_init.te
 
 (neverallow base_typeattr_239 vendor_init (process (ptrace)))
 ;;* lme
diff --git a/prebuilts/api/202504/private/hwservice_contexts b/prebuilts/api/202504/private/hwservice_contexts
index 4a44dc5..c56454f 100644
--- a/prebuilts/api/202504/private/hwservice_contexts
+++ b/prebuilts/api/202504/private/hwservice_contexts
@@ -34,6 +34,7 @@
 android.hardware.gnss::IGnss                                    u:object_r:hal_gnss_hwservice:s0
 android.hardware.graphics.allocator::IAllocator                 u:object_r:hal_graphics_allocator_hwservice:s0
 android.hardware.graphics.composer::IComposer                   u:object_r:hal_graphics_composer_hwservice:s0
+android.hardware.tv.mediaquality::IPictureProfileChangedListener     u:object_r:hal_graphics_composer_hwservice:s0
 android.hardware.graphics.mapper::IMapper                       u:object_r:hal_graphics_mapper_hwservice:s0
 android.hardware.health::IHealth                                u:object_r:hal_health_hwservice:s0
 android.hardware.health.storage::IStorage                       u:object_r:hal_health_storage_hwservice:s0
diff --git a/prebuilts/api/202504/private/mmd.te b/prebuilts/api/202504/private/mmd.te
index 1c0eca1..9a76909 100644
--- a/prebuilts/api/202504/private/mmd.te
+++ b/prebuilts/api/202504/private/mmd.te
@@ -6,6 +6,7 @@
 init_daemon_domain(mmd)
 
 # Set mmd.enabled_aconfig and zram backing device size.
+set_prop(mmd, mmd_shared_status_prop)
 set_prop(mmd, mmd_status_prop)
 get_prop(mmd, mmd_prop)
 get_prop(mmd, device_config_mmd_native_prop)
diff --git a/prebuilts/api/202504/private/property.te b/prebuilts/api/202504/private/property.te
index f560007..27812a1 100644
--- a/prebuilts/api/202504/private/property.te
+++ b/prebuilts/api/202504/private/property.te
@@ -86,6 +86,7 @@
 system_restricted_prop(device_config_virtualization_framework_native_prop)
 system_restricted_prop(fstype_prop)
 system_restricted_prop(log_file_logger_prop)
+system_restricted_prop(mmd_shared_status_prop)
 system_restricted_prop(persist_sysui_builder_extras_prop)
 system_restricted_prop(persist_sysui_ranking_update_prop)
 system_restricted_prop(page_size_prop)
diff --git a/prebuilts/api/202504/private/property_contexts b/prebuilts/api/202504/private/property_contexts
index 92d8dca..ff877c9 100644
--- a/prebuilts/api/202504/private/property_contexts
+++ b/prebuilts/api/202504/private/property_contexts
@@ -649,6 +649,8 @@
 bluetooth.hardware.radio.le_rx_path_loss_comp_db     u:object_r:bluetooth_config_prop:s0 exact int
 bluetooth.hardware.wakeup_supported                  u:object_r:bluetooth_config_prop:s0 exact bool
 
+bluetooth.hci.msft_vendor_opcode                     u:object_r:bluetooth_config_prop:s0 exact uint
+
 bluetooth.framework.support_persisted_state          u:object_r:bluetooth_config_prop:s0 exact bool
 bluetooth.framework.adapter_address_validation       u:object_r:bluetooth_config_prop:s0 exact bool
 
@@ -721,7 +723,6 @@
 bluetooth.core.le.connection_scan_window_slow        u:object_r:bluetooth_config_prop:s0 exact uint
 bluetooth.core.le.inquiry_scan_interval              u:object_r:bluetooth_config_prop:s0 exact uint
 bluetooth.core.le.inquiry_scan_window                u:object_r:bluetooth_config_prop:s0 exact uint
-bluetooth.core.le.msft_vendor_opcode                 u:object_r:bluetooth_config_prop:s0 exact uint
 
 bluetooth.core.le.vendor_capabilities.enabled        u:object_r:bluetooth_config_prop:s0 exact bool
 bluetooth.hfp.software_datapath.enabled              u:object_r:bluetooth_config_prop:s0 exact bool
@@ -1821,5 +1822,5 @@
 # Properties for mmd
 mmd. u:object_r:mmd_prop:s0
 mmd.zram.enabled u:object_r:mmd_shared_prop:s0 exact bool
-mmd.enabled_aconfig u:object_r:mmd_status_prop:s0 exact bool
+mmd.enabled_aconfig u:object_r:mmd_shared_status_prop:s0 exact bool
 mmd.status. u:object_r:mmd_status_prop:s0
diff --git a/prebuilts/api/202504/private/service.te b/prebuilts/api/202504/private/service.te
index 3b84e93..96f208d 100644
--- a/prebuilts/api/202504/private/service.te
+++ b/prebuilts/api/202504/private/service.te
@@ -37,7 +37,9 @@
 until_board_api(202504, `
     type hal_mediaquality_service, protected_service, hal_service_type, service_manager_type;
 ')
-
+until_board_api(202504, `
+    type hal_hwcrypto_service, protected_service, hal_service_type, service_manager_type;
+')
 is_flag_enabled(RELEASE_SUPERVISION_SERVICE, `
     type supervision_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
 ')
diff --git a/prebuilts/api/202504/private/service_contexts b/prebuilts/api/202504/private/service_contexts
index dec8f6b..ad41229 100644
--- a/prebuilts/api/202504/private/service_contexts
+++ b/prebuilts/api/202504/private/service_contexts
@@ -56,6 +56,7 @@
 android.hardware.gnss.IGnss/default                                  u:object_r:hal_gnss_service:s0
 android.hardware.graphics.allocator.IAllocator/default               u:object_r:hal_graphics_allocator_service:s0
 android.hardware.graphics.composer3.IComposer/default                u:object_r:hal_graphics_composer_service:s0
+android.hardware.tv.mediaquality.IPictureProfileChangedListener/default     u:object_r:hal_graphics_composer_service:s0
 android.hardware.health.storage.IStorage/default                     u:object_r:hal_health_storage_service:s0
 android.hardware.health.IHealth/default                              u:object_r:hal_health_service:s0
 android.hardware.identity.IIdentityCredentialStore/default           u:object_r:hal_identity_service:s0
diff --git a/prebuilts/api/202504/private/vendor_init.te b/prebuilts/api/202504/private/vendor_init.te
index 60962d4..939bcc0 100644
--- a/prebuilts/api/202504/private/vendor_init.te
+++ b/prebuilts/api/202504/private/vendor_init.te
@@ -316,6 +316,7 @@
 
 get_prop(vendor_init, boot_status_prop)
 get_prop(vendor_init, exported3_system_prop)
+get_prop(vendor_init, mmd_shared_status_prop)
 get_prop(vendor_init, ota_prop)
 get_prop(vendor_init, power_debug_prop)
 get_prop(vendor_init, provisioned_prop)
diff --git a/prebuilts/api/202504/public/service.te b/prebuilts/api/202504/public/service.te
index aa9d184..2d7cedf 100644
--- a/prebuilts/api/202504/public/service.te
+++ b/prebuilts/api/202504/public/service.te
@@ -326,6 +326,9 @@
 type hal_graphics_mapper_service, hal_service_type, service_manager_type;
 type hal_health_service, protected_service, hal_service_type, service_manager_type;
 type hal_health_storage_service, protected_service, hal_service_type, service_manager_type;
+starting_at_board_api(202504, `
+    type hal_hwcrypto_service, protected_service, hal_service_type, service_manager_type;
+')
 type hal_identity_service, protected_service, hal_service_type, service_manager_type;
 type hal_input_processor_service, protected_service, hal_service_type, service_manager_type;
 type hal_ir_service, protected_service, hal_service_type, service_manager_type;
diff --git a/private/compat/202404/202404.ignore.cil b/private/compat/202404/202404.ignore.cil
index 224c49b..69e7d5e 100644
--- a/private/compat/202404/202404.ignore.cil
+++ b/private/compat/202404/202404.ignore.cil
@@ -17,6 +17,7 @@
     forensic_service
     fstype_prop
     fwk_vold_service
+    hal_hwcrypto_service
     hal_mediaquality_service
     hal_vm_capabilities_service
     intrusion_detection_service
diff --git a/private/service.te b/private/service.te
index 3b84e93..96f208d 100644
--- a/private/service.te
+++ b/private/service.te
@@ -37,7 +37,9 @@
 until_board_api(202504, `
     type hal_mediaquality_service, protected_service, hal_service_type, service_manager_type;
 ')
-
+until_board_api(202504, `
+    type hal_hwcrypto_service, protected_service, hal_service_type, service_manager_type;
+')
 is_flag_enabled(RELEASE_SUPERVISION_SERVICE, `
     type supervision_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
 ')
diff --git a/public/service.te b/public/service.te
index aa9d184..2d7cedf 100644
--- a/public/service.te
+++ b/public/service.te
@@ -326,6 +326,9 @@
 type hal_graphics_mapper_service, hal_service_type, service_manager_type;
 type hal_health_service, protected_service, hal_service_type, service_manager_type;
 type hal_health_storage_service, protected_service, hal_service_type, service_manager_type;
+starting_at_board_api(202504, `
+    type hal_hwcrypto_service, protected_service, hal_service_type, service_manager_type;
+')
 type hal_identity_service, protected_service, hal_service_type, service_manager_type;
 type hal_input_processor_service, protected_service, hal_service_type, service_manager_type;
 type hal_ir_service, protected_service, hal_service_type, service_manager_type;