Snap for 6607158 from 31ae1530665e219f466a57af44d731a2830b0be8 to mainline-release

Change-Id: I8e0dd9eb901e4d43101d972b33d252dd0226ac20
diff --git a/vendor/google/file_contexts b/vendor/google/file_contexts
index ba72269..4fd4689 100644
--- a/vendor/google/file_contexts
+++ b/vendor/google/file_contexts
@@ -33,6 +33,7 @@
 /vendor/bin/hw/android\.hardware\.camera\.provider@2\.6-service-google                u:object_r:hal_camera_default_exec:s0
 /vendor/bin/hw/android\.hardware\.contexthub@1\.1-service\.generic                    u:object_r:hal_contexthub_default_exec:s0
 /vendor/bin/hw/android\.hardware\.keymaster@4\.1-service\.citadel                     u:object_r:hal_keymaster_citadel_exec:s0
+/vendor/bin/hw/android\.hardware\.identity@1\.0-service\.citadel                      u:object_r:hal_identity_citadel_exec:s0
 /vendor/bin/hw/android\.hardware\.neuralnetworks@1\.2-service-noronha                 u:object_r:hal_neuralnetworks_darwinn_exec:s0
 /vendor/bin/hw/android\.hardware\.power\.stats@1\.0-service\.pixel                    u:object_r:hal_power_stats_default_exec:s0
 /vendor/bin/hw/android\.hardware\.rebootescrow-service\.citadel                       u:object_r:hal_rebootescrow_citadel_exec:s0
diff --git a/vendor/google/hal_identity_citadel.te b/vendor/google/hal_identity_citadel.te
new file mode 100644
index 0000000..e29310c
--- /dev/null
+++ b/vendor/google/hal_identity_citadel.te
@@ -0,0 +1,9 @@
+type hal_identity_citadel, domain;
+type hal_identity_citadel_exec, exec_type, vendor_file_type, file_type;
+
+vndbinder_use(hal_identity_citadel)
+binder_call(hal_identity_citadel, citadeld)
+allow hal_identity_citadel citadeld_service:service_manager find;
+
+hal_server_domain(hal_identity_citadel, hal_identity)
+init_daemon_domain(hal_identity_citadel)
diff --git a/vendor/google/vendor_init.te b/vendor/google/vendor_init.te
index fb17932..7ec076d 100644
--- a/vendor/google/vendor_init.te
+++ b/vendor/google/vendor_init.te
@@ -16,7 +16,7 @@
 set_prop(vendor_init, vendor_modem_diag_prop)
 get_prop(vendor_init, vendor_usb_prop)
 set_prop(vendor_init, vendor_bluetooth_prop)
-set_prop(vendor_init, power_prop)
+set_prop(vendor_init, vendor_power_prop)
 set_prop(vendor_init, vendor_display_prop)
 set_prop(vendor_init, camera_prop)
 set_prop(vendor_init, vendor_build_type_prop)