Merge Android 12 QPR1

Bug: 210511427
Merged-In: I043307a41b07b6a29d680f482b7d786e4d4e8ba5
Change-Id: I75c485b1af25f0bc14ba786546f23cc12486ae33
diff --git a/debugpolicy/device.te b/debugpolicy/device.te
index c774e3b..1deb4ab 100644
--- a/debugpolicy/device.te
+++ b/debugpolicy/device.te
@@ -1 +1 @@
-type dpm_block_device, dev_type;
+type dpm_block_device, dev_type, bdev_type;
diff --git a/rebalance_interrupts/rebalance_interrupts.te b/rebalance_interrupts/rebalance_interrupts.te
index 668a696..a76b7d6 100644
--- a/rebalance_interrupts/rebalance_interrupts.te
+++ b/rebalance_interrupts/rebalance_interrupts.te
@@ -7,4 +7,5 @@
 allow rebalance_interrupts_vendor sysfs_irq:dir r_dir_perms;
 allow rebalance_interrupts_vendor sysfs_irq:file r_file_perms;
 allow rebalance_interrupts_vendor proc_irq:dir r_dir_perms;
-allow rebalance_interrupts_vendor proc_irq:file rw_file_perms;
+allow rebalance_interrupts_vendor proc_irq:file { rw_file_perms setattr };
+allow rebalance_interrupts_vendor self:capability { chown setuid setgid };