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

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

Change-Id: Idce53f0da65932c989b6c9ab4dbecf63ef76eb9d