This reverts commit efaeac87c2. Reason for revert: the patch for iommu has been merged Test: shiba rebooted 1000 times without failure and https://android-build.googleplex.com/builds/abtd/run/L49300000960255489 run device-boot-health-check-extra for husky Bug: 271931921 Change-Id: I4dcbc1e2028facd8531c94c03d0b28cbd6769b06
efaeac87c2