Merge "Stop using the bdev_type and sysfs_block_type SELinux attributes" am: 7609e175c5 am: 8800cabef3 am: 8925c625d4

Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/1854072

Change-Id: Ie0eb3e8816e766771e55799911f35c4a12b72320