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

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

Change-Id: If0cfa5c451fb6d46cd1673d8640035e6ccf56aec