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

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

Change-Id: Iff051a9a266d6de9d63198686366fec0318d4fc8