Revert "Revert "Remove the bdev_type and sysfs_block_type SELinux attributes"" am: 37ae749c20 am: bb4e94869c

Original change: https://android-review.googlesource.com/c/device/google/bonito-sepolicy/+/1863013

Change-Id: I72906f2bc3f90c1c203d12070f56c2cd2365e585
diff --git a/vendor/qcom/common/device.te b/vendor/qcom/common/device.te
index b1fa00c..11ec49b 100644
--- a/vendor/qcom/common/device.te
+++ b/vendor/qcom/common/device.te
@@ -1,15 +1,15 @@
-type ab_block_device, dev_type, bdev_type;
+type ab_block_device, dev_type;
 type at_device, dev_type;
 type avtimer_device, dev_type;
 type bt_device, dev_type;
-type devinfo_block_device, dev_type, bdev_type;
+type devinfo_block_device, dev_type;
 type diag_device, dev_type, mlstrustedobject;
 type dsp_device, dev_type;
 type easel_device, dev_type, mlstrustedobject;
-type gpt_block_device, dev_type, bdev_type;
+type gpt_block_device, dev_type;
 type ipa_dev, dev_type;
-type modem_block_device, dev_type, bdev_type;
-type persist_block_device, dev_type, bdev_type;
+type modem_block_device, dev_type;
+type persist_block_device, dev_type;
 type qce_device, dev_type;
 type qsee_ipc_irq_spss_device, dev_type;
 type qdsp_device, dev_type, mlstrustedobject;
@@ -19,10 +19,10 @@
 type sg_device, dev_type;
 type smd_device, dev_type;
 type spcom_device, dev_type;
-type ssd_block_device, dev_type, bdev_type;
+type ssd_block_device, dev_type;
 type ssr_device, dev_type;
 type wlan_device, dev_type;
-type xbl_block_device, dev_type, bdev_type;
+type xbl_block_device, dev_type;
 
 # TODO: Replace KM3 with KM4 (b/112339903)
-type rpmb_device, dev_type, bdev_type;
+type rpmb_device, dev_type;
diff --git a/vendor/qcom/common/file.te b/vendor/qcom/common/file.te
index e4435d1..5ca58ba 100644
--- a/vendor/qcom/common/file.te
+++ b/vendor/qcom/common/file.te
@@ -13,7 +13,7 @@
 type sysfs_poweroff, sysfs_type, fs_type;
 type sysfs_rmtfs, sysfs_type, fs_type;
 type sysfs_soc, sysfs_type, fs_type;
-type sysfs_scsi_devices_0000, sysfs_type, fs_type, sysfs_block_type;
+type sysfs_scsi_devices_0000, sysfs_type, fs_type;
 type sysfs_scsi_devices_other, sysfs_type, fs_type;
 type sysfs_mmc, sysfs_type, fs_type;
 type sysfs_system_sleep_stats, sysfs_type, fs_type;