Merge "Stop using the bdev_type and sysfs_block_type SELinux attributes" am: 5e016c1721 am: df2c2457dc am: 46cbeedd02 am: 89a0a01910

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

Change-Id: Id1950132fb6268e2fa44f6af53c30add15e6df89