Merge "Enable MTE workaround for b/324412910" into main