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

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

Change-Id: I5a80687417ec7d71363e5db7f6114118369a6afd