Merge "iommu/arm-smmu: Always set resume to terminate the transaction" into msm-4.8