Revert "Remove the bdev_type and sysfs_block_type SELinux attributes" am: ceb89d2986

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

Change-Id: I7c75c81be7f84a2d3195bd8131bc7e865c1324cd
diff --git a/vendor/qcom/common/device.te b/vendor/qcom/common/device.te
index 2b65291..0dcd4fc 100644
--- a/vendor/qcom/common/device.te
+++ b/vendor/qcom/common/device.te
@@ -1,15 +1,15 @@
-type ab_block_device, dev_type;
+type ab_block_device, dev_type, bdev_type;
 type at_device, dev_type;
 type avtimer_device, dev_type;
 type bt_device, dev_type;
-type devinfo_block_device, dev_type;
+type devinfo_block_device, dev_type, bdev_type;
 type diag_device, dev_type, mlstrustedobject;
 type dsp_device, dev_type;
 type easel_device, dev_type, mlstrustedobject;
-type gpt_block_device, dev_type;
+type gpt_block_device, dev_type, bdev_type;
 type ipa_dev, dev_type;
-type modem_block_device, dev_type;
-type persist_block_device, dev_type;
+type modem_block_device, dev_type, bdev_type;
+type persist_block_device, dev_type, bdev_type;
 type qsee_ipc_irq_spss_device, dev_type;
 type qdsp_device, dev_type, mlstrustedobject;
 type ramdump_device, dev_type;
@@ -18,7 +18,7 @@
 type sg_device, dev_type;
 type smd_device, dev_type;
 type spcom_device, dev_type;
-type ssd_block_device, dev_type;
+type ssd_block_device, dev_type, bdev_type;
 type ssr_device, dev_type;
 type wlan_device, dev_type;
-type xbl_block_device, dev_type;
+type xbl_block_device, dev_type, bdev_type;
diff --git a/vendor/qcom/common/file.te b/vendor/qcom/common/file.te
index 14f4da8..13d6008 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;
+type sysfs_scsi_devices_0000, sysfs_type, fs_type, sysfs_block_type;
 type sysfs_scsi_devices_other, sysfs_type, fs_type;
 type sysfs_system_sleep_stats, sysfs_type, fs_type;
 type sysfs_timestamp_switch, sysfs_type, fs_type;