Merge "DSU: Apply erratum 936184 for Neoverse N1/E1" into integration